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

[Fabian Affolter]

commit 0ae01de59b37f8a1aa64a8cc88163a84c7b4dce8
Merge: 3ae1c1a 44920ed
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Feb 11 01:12:25 2012 +0100

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

 klavaro.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc klavaro.spec
index 727ef1d,b49d35d..ffc47f9
--- a/klavaro.spec
+++ b/klavaro.spec
@@@ -82,9 -82,9 +82,12 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Sat Feb 11 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.9.4-1
 +- Updated to new upstream release 1.9.4
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sat Nov 26 2011 Fabian Affolter <mail at fabian-affolter.ch> - 1.9.3-1
  - Updated to new upstream release 1.9.3