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

[Pavel Lisý]

commit 8f668b9d31f6c3c8112e6e457dd166eab2e94c49
Merge: 4a055ad 96c7690
Author: Pavel Lisý <pali at fedoraproject.org>
Date:   Tue Sep 13 09:21:51 2011 +0200

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

 cherokee.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc cherokee.spec
index cb0503d,5de6436..6a2084b
--- a/cherokee.spec
+++ b/cherokee.spec
@@@ -243,19 -176,11 +243,22 @@@ f
  %{_datadir}/aclocal/%{name}.m4
  %{_libdir}/lib%{name}-*.so
  
 -
  %changelog
 +* Tue Sep 10 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.99-1
 +- Latest 1.2.x upstream release
 +- Resolves bz 713306
 +- Resolves bz 710473
 +- Resolves bz 728741
 +- Resolves bz 720515
 +- Resolves bz 701196
 +- Resolves bz 712555
 +
 +* Wed Aug 10 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.98-1
 +- Latest 1.2.x upstream release
 +
+ * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 1.2.1-2
+ - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+ 
  * Fri Feb 22 2011 Pavel Lisý <pali at fedoraproject.org> - 1.2.1-1
  - Resolves bz 678243
  - Resolves bz 680051