[mach/f21: 9/9] Merge branch 'f20' into f21

[Thomas Vander Stichele]

commit 4d9235a4c20ad53a05adb812b36c3bcc8b953e54
Merge: 41faf3d 3e9d6bd
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sun Mar 8 18:32:07 2015 -0400

    Merge branch 'f20' into f21
    
    Conflicts:
    	mach.spec

 .gitignore |  3 +++
 mach.spec  | 12 ++++++++++--
 sources    |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)
---
diff --cc mach.spec
index cc858f3,b2df2e8..7e62f1f
--- a/mach.spec
+++ b/mach.spec
@@@ -110,12 -110,14 +110,20 @@@ f
  %attr(04750,root,mach) %{_sbindir}/mach-helper
  
  %changelog
+ * Sun Mar 08 2015 Thomas Vander Stichele <thomas at apestaart dot org>
+ - 1.0.4-1
+ - new upstream release
+ 
+ * Sun Jun 29 2014 Thomas Vander Stichele <thomas at apestaart dot org>
+ - 1.0.3-1
+ - new upstream release
+ 
 +* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 +
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild