Merge master into el5

2010-09-24 20:31:57 -04:00 · 2010-09-24 20:31:57 -04:00 · 05dc826468
parent 5fd9362b70
commit 05dc826468
1 changed files with 0 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1 @@
-<<<<<<< HEAD
-znc-0.093.svn2101.tar.bz2
-=======
 znc-0.094.tar.gz
->>>>>>> master