[BitchX/f16: 23/23] Merge branch 'master' into f16

[Dan Mashal]

commit 8af498bbf8f26a40d0f71e4bfc6895e5ce8f5c57
Merge: bd19e84 0db9c0f
Author: Dan Mashal <vicodan at fedoraproject.org>
Date:   Mon May 14 18:13:34 2012 -0700

    Merge branch 'master' into f16
    
    Conflicts:
    	BitchX.spec
    	sources

 BitchX.spec |   10 ++++++++++
 sources     |    4 ++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --cc BitchX.spec
index 539c328,c4f40ba..efed494
--- a/BitchX.spec
+++ b/BitchX.spec
@@@ -1,7 -1,7 +1,11 @@@
  Summary: IrcII chat client
  Name: BitchX
  Version: 1.2
++<<<<<<< HEAD
 +Release: 7%{?dist}
++=======
+ Release: 8%{?dist}
++>>>>>>> master
  License: BSD and GPLv2+
  Group: Applications/Communications
  URL: http://www.bitchx.org
@@@ -33,6 -33,9 +37,12 @@@ rm -rf %{buildroot
  %{_mandir}/man1/*
  
  %changelog
++<<<<<<< HEAD
++=======
+ * Mon May 14 2012 Dan Mashal <vicodan at fedoraproject.org> 1.2-8
+ -Updated to latest source code (svn rev 181)
+ 
++>>>>>>> master
  * Fri May 10 2012 Dan Mashal <vicodan at fedoraproject.org> 1.2-7
  -Various bugfixes and update to the latest BitchX source code (svn rev 180)
  
diff --cc sources
index 0fe0d2a,9b45604..da7b100
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +e1b687f5d27cb7030abaaba70bddd032  BitchX1.2.tar.gz
++=======
+ fc0fb2efe704971bc8ab58584752dcf4  BitchX1.2.tar.gz
++>>>>>>> master