[packagedb-cli/el5: 10/10] Merge branch 'el6' into el5

[Pierre-YvesChibon]

commit 7cf5ecd7a6ca1b0e9834ed2287a2b12c292f4d94
Merge: d07ea77 006c699
Author: Pierre-Yves Chibon <pingou at pingoured.fr>
Date:   Wed Jan 23 15:06:40 2013 +0100

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

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