[znc: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/znc

[Nick Bebout]

commit e6732194ce0b80fbe685a82575a9ba6192c7a1c1
Merge: 4b7d7ba e17a3df
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Fri Jan 7 18:24:04 2011 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/znc
    
    Conflicts:
    	znc.spec

 znc.spec |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc znc.spec
index 82fe7d6,369e6a0..a6210cb
--- a/znc.spec
+++ b/znc.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary:        An advanced IRC bouncer
  Name:           znc
  Version:        0.097
- Release:        2.svn2255%{?dist}
 -Release:        3.svn2214%{?dist}
++Release:        4.svn2255%{?dist}
  #Release:        0.1.rc1%{?dist}
  #Release:        2%{?dist}
  License:        GPLv2 with exceptions
@@@ -178,8 -177,11 +178,15 @@@ chmod -x modules/q.cp
  %{_libdir}/znc/modpython.so
  
  %changelog
- * Fri Dec 24 2010 Nick Bebout <nb at fedoraproject.org> - 0.097-2.svn2255
- - Patch has been upstreamed, update to svn2255
++<<<<<<< HEAD
++* Fri Jan 7 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-4.svn2255
++- Update to svn2255
++
+ * Mon Jan  3 2011 David Malcolm <dmalcolm at redhat.com> - 0.097-3.svn2214
+ - rebuild for newer python3 (see rhbz#666429)
+ 
+ * Fri Dec 24 2010 Nick Bebout <nb at fedoraproject.org> - 0.097-2.svn2214
+ - Patch has been upstreamed, update to svn2214
  
  * Wed Dec 22 2010 Nick Bebout <nb at fedoraproject.org> - 0.097-1.svn2213
  - Update to znc 0.097-svn2213 which also adds modpython