[createrepo_c/f21: 5/5] Merge branch 'master' into f21

[Tomas Mlcoch]

commit d39b5936149c79907ac436c75f7cc691664e65c3
Merge: af2d2d9 b4e0023
Author: Tomas Mlcoch <tmlcoch at redhat.com>
Date:   Mon Oct 20 09:19:47 2014 +0200

    Merge branch 'master' into f21
    
    Conflicts:
    	createrepo_c.spec

 .gitignore        |    3 +++
 createrepo_c.spec |   24 ++++++++++++++++++------
 sources           |    2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)
---