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

[Robert Scheck]

commit a00c7923f6aaa3ee36e672cda868dbc949f36403
Merge: 14f75b5 f9da150
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Thu Jul 3 22:02:34 2014 +0200

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

 jupp.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jupp.spec
index 7f3cb0d,64daece..d3b5013
--- a/jupp.spec
+++ b/jupp.spec
@@@ -53,9 -53,9 +53,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man1/%{name}.1*
  
  %changelog
 +* Thu Jul 03 2014 Robert Scheck <robert at fedoraproject.org> 27-1
 +- Upgrade to 27
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 26-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Fri Dec 27 2013 Robert Scheck <robert at fedoraproject.org> 26-1
  - Upgrade to 26