[znc/el5/master: 5/5] Merge master into el5

[Nick Bebout]

commit 05dc82646892183a232d172bcd7600662d81361f
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Sep 24 20:31:57 2010 -0400

    Merge master into el5

 .gitignore |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3319075..e6db9a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
-znc-0.093.svn2101.tar.bz2
-=======
 znc-0.094.tar.gz
->>>>>>> master