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

[Göran Uddeborg]

commit 7c7149b07cca5cb49ea77f6fda73fce8ae7c5f8d
Merge: 875a25e 49f8a1e
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Mon Jul 7 18:51:09 2014 +0200

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

 mj.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc mj.spec
index e478ca0,2350f01..ef75d2c
--- a/mj.spec
+++ b/mj.spec
@@@ -130,10 -133,9 +130,14 @@@ gtk-update-icon-cache %icontop &>/dev/n
  
  
  %changelog
++
 +* Mon Jul 07 2014 Göran Uddeborg <goeran at uddeborg.se> - 1.14-1
 +- Upgrade to new version
 +- Drop upstreamed patch
 +
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Tue Dec  3 2013 Göran Uddeborg <goeran at uddeborg.se> 1.13-1
  - Upgraded to new upstream 1.13. Bz #1021370
  - Fixed printf format security issue.  Bz #1037202.