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

[Alex Wood]

commit cac2f891462dfbbc9f605144c459d1c819b46430
Merge: 30e224a e72bd9f
Author: Alex Wood <awood at redhat.com>
Date:   Mon Mar 9 09:23:58 2015 -0400

    Merge branch 'master' into f21

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