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

[Matej Cepl]

commit b78a6ae6ae3cc7847bbab754d07fbc606a081824
Merge: 4069518 86e48e1
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Wed Mar 9 10:41:56 2011 +0100

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

 bitlbee.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc bitlbee.spec
index ecab27f,18cafeb..246a4b3
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@@ -141,7 -143,7 +141,7 @@@ if [ $1 -eq 0 ]; the
  	/sbin/service xinetd condrestart > /dev/null 2>&1
  fi
  %else
--# Work around RHBZ #655116 
++# Work around RHBZ #655116
  if [ $1 -eq 0 ] ; then
  	# Package removal, not upgrade
  	/bin/systemctl disable bitlbee.service > /dev/null 2>&1 || :
@@@ -191,6 -192,9 +191,13 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
++* Wed Mar 09 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.2-1
++- New upstream release. We can eliminate parts which were already merged
++  upstream (ssl_pending patch)
++
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-9
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Sun Jan 09 2011 Matěj Cepl <mcepl at redhat.com> - 3.0.1-8
  - Fix crash when no SRV record is provided (#668190); fix by Ricky Zhou