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

[Nick Bebout]

commit 3aff4facfeebdbd93dae0010c5838c7d73c99e8b
Merge: 82c7dfc abe48fa
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Feb 15 18:27:30 2011 -0600

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

 .gitignore |    1 +
 znc.spec   |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 7e9929f,01d61ce..86cd0ba
--- a/.gitignore
+++ b/.gitignore
@@@ -8,4 -8,4 +8,5 @@@ znc-0.094.tar.g
  /znc-0.097.svn2255.tar.bz2
  /znc-0.097.svn2269.tar.bz2
  /znc-0.097.svn2272.tar.xz
+ /znc-0.097.svn2277.tar.xz
 +/znc-0.097.tar.xz
diff --cc znc.spec
index 5c0efb6,02fb14a..220c810
--- a/znc.spec
+++ b/znc.spec
@@@ -178,9 -178,9 +178,12 @@@ chmod -x modules/q.cp
  %{_libdir}/znc/modpython.so
  
  %changelog
 +* Tue Feb 15 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-8.20110215git
 +- Update to latest git
 +
+ * Wed Feb 09 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-7.svn2277
+ - Update to svn2277
+ 
  * Mon Jan 24 2011 Nick Bebout <nb at fedoraproject.org> - 0.097-6.svn2272
  - Update to svn2272