[subscription-manager/f21: 2/2] Merge branch 'master' into f21

[Alex Wood]

commit 911cbc4991b61c50efb7c50680406b3a16660046
Merge: fa8de9e 7f14d74
Author: Alex Wood <awood at redhat.com>
Date:   Fri Oct 24 10:35:09 2014 -0400

    Merge branch 'master' into f21

 .gitignore                |    1 +
 sources                   |    2 +-
 subscription-manager.spec |   27 +++++++++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)
---