[packagedb-cli/el6: 4/4] Merge branch 'master' into el6

[Pierre-YvesChibon]

commit a8f18604de9e2adf7772873b77fb45ed69160837
Merge: 6a9b405 391e9e9
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu Sep 5 11:19:14 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	packagedb-cli.spec
    	sources

 .gitignore         |    1 +
 packagedb-cli.spec |   11 +++++++++++
 sources            |    2 +-
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --cc packagedb-cli.spec
index be3ebf4,2f4d894..1f4488c
--- a/packagedb-cli.spec
+++ b/packagedb-cli.spec
@@@ -1,5 -1,5 +1,9 @@@
  Name:           packagedb-cli
++<<<<<<< HEAD
 +Version:        1.5.0
++=======
+ Version:        1.5.1
++>>>>>>> master
  Release:        1%{?dist}
  Summary:        A CLI for pkgdb
  
@@@ -57,6 -57,13 +61,13 @@@ install pkgdb-cli $RPM_BUILD_ROOT/%{_bi
  %{_bindir}/pkgdb-cli
  
  %changelog
 -* Thu Sep 05 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 1.5.0-1
++* Thu Sep 05 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 1.5.1-1
+ - Update to 1.5.1
+ - Fixes RHBZ#995430 and RHBZ#970120
+ 
+ * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+ 
  * Thu May 23 2013 Pierre-Yves Chibon <pingou at pingoured.fr> - 1.5.0-1
  - Update to 1.5.0
  - Fixes RHBZ#966196