[mpop/f14/master: 4/4] Merge branch 'master' into f14

[Fabian Affolter]

commit 9ed8708136357bc5c4230ae95344a4be6eed4b67
Merge: 2a5bd9d 8c8ab3e
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Mon Mar 28 21:58:47 2011 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	mpop.spec
    	sources

 .gitignore |    2 ++
 mpop.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc mpop.spec
index 81e762d,d691706..6bd8f49
--- a/mpop.spec
+++ b/mpop.spec
@@@ -67,6 -67,12 +67,9 @@@ f
  
  
  %changelog
+ * Mon Mar 28 2011 Fabian Affolter <fabian at bernewireless.net> - 1.0.23-1
+ - Updated to new upstream version 1.0.23
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Mon Jan 17 2011 Fabian Affolter <fabian at bernewireless.net> - 1.0.22-1
  - Updated to new upstream version 1.0.22