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

[Pierre-YvesChibon]

commit 006c699c5ebccb9b5995b708acd4889e915d5e1d
Merge: 77cb002 2890a86
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Wed Jan 23 15:05:25 2013 +0100

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

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