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

[Than Ngo]

commit 0989d47d415cd548457d6007db540e2c40b58da4
Merge: fa89cb3 0c496d6
Author: Than Ngo <than at redhat.com>
Date:   Tue Feb 24 18:39:59 2015 +0100

    Merge branch 'master' into f20

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