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

[Ales Kozumplik]

commit 9a07d21d4a2f3e428088d131271f9f370193983d
Merge: 317b188 5a6cb4f
Author: Ales Kozumplik <ales at redhat.com>
Date:   Tue May 27 17:29:30 2014 +0200

    Merge branch 'master' into f20

 .gitignore  |    1 +
 hawkey.spec |   33 ++++++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 30 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 1c3d05d,4a0d3fb..38228a6
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,49 +1,3 @@@
 -/hawkey-042738b.tar.xz
 -/hawkey-76a5b8c.tar.xz
 -/hawkey-ea88ad5.tar.xz
 -/hawkey-41b39ba.tar.xz
 -/hawkey-e6734fb.tar.xz
 -/hawkey-8599c55.tar.xz
 -/hawkey-a198dea.tar.xz
 -/hawkey-545a461.tar.xz
 -/hawkey-0245875.tar.xz
 -/hawkey-687ceab.tar.xz
 -/hawkey-69b12a4.tar.xz
 -/hawkey-7fa7aa9.tar.xz
 -/hawkey-afa7717.tar.xz
 -/hawkey-6f9df85.tar.xz
 -/hawkey-e883549.tar.xz
 -/hawkey-4e41b7f.tar.xz
 -/hawkey-b3fcf21.tar.xz
 -/hawkey-f981c48.tar.xz
 -/hawkey-c8365fa.tar.xz
 -/hawkey-a53a6b1.tar.xz
 -/hawkey-dd10ac7.tar.xz
 -/hawkey-046ab1c.tar.xz
 -/hawkey-c0c16c0.tar.xz
 -/hawkey-1d51b83.tar.xz
 -/hawkey-ffe0dac.tar.xz
 -/hawkey-60cc1cc.tar.xz
 -/hawkey-2a04c71.tar.xz
 -/hawkey-15db39f.tar.xz
 -/hawkey-78b3aa0.tar.xz
 -/hawkey-996cd40.tar.xz
 -/hawkey-4e79abc.tar.xz
 -/hawkey-1e5a593.tar.xz
 -/hawkey-0e5506a.tar.xz
 -/hawkey-6f35513.tar.xz
 -/hawkey-4c51f65.tar.xz
 -/hawkey-dcfbe87.tar.xz
 -/hawkey-513440a.tar.xz
 -/hawkey-9ed6fca.tar.xz
 -/hawkey-6df2dad.tar.xz
 -/hawkey-e9a7b79.tar.xz
 -/hawkey-7890cf9.tar.xz
 -/hawkey-20392bc.tar.xz
 -/hawkey-8d6af87.tar.xz
 -/hawkey-fc24328.tar.xz
 -/hawkey-f5edea1.tar.xz
 -/hawkey-a0fafad.tar.xz
  /hawkey-52f8596.tar.xz
  /hawkey-428a977.tar.xz
+ /hawkey-a56916e.tar.xz