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

[Alex Wood]

commit 9f2418d016e374406e27506b830456fa8509fb9a
Merge: 911cbc4 aee9465
Author: Alex Wood <awood at redhat.com>
Date:   Fri Nov 21 15:49:00 2014 -0500

    Merge branch 'master' into f21

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