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

[Tom Callaway]

commit 7c6bb13edb50b267a706a02e97a2b043eaa9e90f
Merge: fd3ffab bed8289
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Jun 25 12:40:38 2014 -0400

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

 rpmlint.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc rpmlint.spec
index 5f1b56a,237efd5..1aad23e
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           rpmlint
  Version:        1.5
--Release:        11%{?dist}
++Release:        12%{?dist}
  Summary:        Tool for checking common errors in RPM packages
  
  Group:          Development/Tools
@@@ -114,9 -114,9 +114,12 @@@ make chec
  
  
  %changelog
- * Wed Jun 25 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-11
++* Wed Jun 25 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-12
 +- add systemd to UsrLibBinaryException
 +
+ * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-11
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu May 29 2014 Tom Callaway <spot at fedoraproject.org> - 1.5-10
  - fix python 3.4 magic number (#1102846)