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

[Matej Cepl]

commit 86388c33e0fd20a2e9e38386801202a2d04be255
Merge: 7fe5b47 81cec16
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Aug 28 16:25:07 2012 +0200

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

 bitlbee.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc bitlbee.spec
index 6af3d6e,f299eb4..4ebf501
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@@ -13,7 -1,7 +13,7 @@@
  Summary:           IRC to other chat networks gateway
  Name:              bitlbee
  Version:           3.0.5
--Release:           3%{?dist}
++Release:           4%{?dist}
  License:           GPLv2+ and MIT
  Group:             System Environment/Daemons
  URL:               http://www.bitlbee.org/
@@@ -213,9 -198,9 +213,12 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
- * Tue Jul 24 2012 Matej Cepl <mcepl at redhat.com> - 3.0.5-3
++* Tue Jul 24 2012 Matej Cepl <mcepl at redhat.com> - 3.0.5-4
 +- The last version of SSL/NSS patch for the upstream #714
 +
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.5-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Thu Jun 21 2012 Matej Cepl <mcepl at redhat.com> - 3.0.5-2
  - Add more error handling to lib/ssl_nss.c
  - Checking patches for compatibility with the current state of the word