[mpop/f16: 2/2] Merge branch 'master' into f16

[Fabian Affolter]

commit c7c6f70e1cac60c558e70b0c9bfdac78a8b7063e
Merge: 026a67b 462a2ca
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat May 5 21:27:52 2012 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	mpop.spec

 .gitignore |    1 +
 mpop.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc mpop.spec
index 379c065,13fd1ca..a3f4095
--- a/mpop.spec
+++ b/mpop.spec
@@@ -67,9 -67,9 +67,12 @@@ f
  
  
  %changelog
+ * Sat May 05 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.27-1
+ - Updated to new upstream version 1.0.27
+ 
 +* Sat Apr 21 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.26-2
 +- Rebuild
 +
  * Sun Jan 08 2012 Fabian Affolter <mail at fabian-affolter.ch> - 1.0.26-1
  - Updated to new upstream version 1.0.26