[hawkey/f20: 3/3] Merge branch 'master' into f20

[Ales Kozumplik]

commit ece32ac749e7c91c526b4fcb447aa92e3053d3e0
Merge: 9a07d21 35c1faf
Author: Ales Kozumplik <ales at redhat.com>
Date:   Mon Jul 7 09:26:09 2014 +0200

    Merge branch 'master' into f20

 .gitignore  |    1 +
 hawkey.spec |   11 +++++++++--
 sources     |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---