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

[Pierre-YvesChibon]

commit 1f3a3733c3b85f4f404ca8cc508cb1992d90bbc8
Merge: 1352b89 6c940e1
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Thu May 15 00:25:33 2014 +0200

    Merge branch 'master' into el6

 .gitignore         |    1 +
 packagedb-cli.spec |    6 +++++-
 sources            |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---