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

[Rex Dieter]

commit 4da0d86dbbf721cd670d640e36a5b87650ffa7a8
Merge: 22bbb95 fb1ce04
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:35:31 2014 -0500

    Merge branch 'master' into f20

 .gitignore |    1 +
 kget.spec  |    5 ++++-
 sources    |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---