[BitchX/f17: 8/8] Merge branch 'master' into f17

[Dan Mashal]

commit 9a0a66c583cf7f1972ac68e00f252ce13d77ffcb
Merge: ba71134 72974b5
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Jul 23 20:54:32 2012 -0700

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

 BitchX.spec |    8 +++++++-
 sources     |    4 ++++
 2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc BitchX.spec
index 3c43e70,273874e..bd3263b
--- a/BitchX.spec
+++ b/BitchX.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: IrcII chat client
  Name: BitchX
  Version: 1.2
- Release: 14%{?dist}
 -Release: 1666666%{?dist}
++Release: 16%{?dist}
  License: BSD and GPLv2+
  Group: Applications/Communications
  URL: http://www.bitchx.org
diff --cc sources
index 0fb1e6b,6b6e3e1..b303ba4
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +ba55d32ef69047f9884b0d69deeecdda  BitchX1.2.tar.gz
++=======
+ f1218676714d790538f7c2f9352d0693  BitchX1.2.tar.gz
++>>>>>>> master