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

[Ales Kozumplik]

commit 133baff8e8705954e6904127bdd49de38eda7401
Merge: ece32ac 3bfea06
Author: Ales Kozumplik <ales at redhat.com>
Date:   Wed Jul 16 15:34:02 2014 +0200

    Merge branch 'master' into f20

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