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

[Pierre-YvesChibon]

commit 92367a0e57e8f2c1b3ca6c8a15739a6c8817c371
Merge: a3ec847 507e629
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Sat Sep 7 11:14:35 2013 +0200

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

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