Merge master into el5
This commit is contained in:
parent
5fd9362b70
commit
05dc826468
|
@ -1,5 +1 @@
|
|||
<<<<<<< HEAD
|
||||
znc-0.093.svn2101.tar.bz2
|
||||
=======
|
||||
znc-0.094.tar.gz
|
||||
>>>>>>> master
|
||||
|
|
Loading…
Reference in New Issue