[createrepo_c/f18: 12/12] Merge branch 'master' into f18 Update to 0.1.15

[Tomas Mlcoch]

commit 92d6bde0a22bb8635969408160381fbf9047baff
Merge: ae71c3a a4a5133
Author: Tomas Mlcoch <tmlcoch at redhat.com>
Date:   Thu Feb 21 13:11:30 2013 +0100

    Merge branch 'master' into f18
    Update to 0.1.15
    
    Conflicts:
    	.gitignore
    	createrepo_c.spec
    	sources

 .gitignore        |    2 ++
 createrepo_c.spec |    8 +++++++-
 sources           |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---