[python-rhsm/f21: 2/2] Merge branch 'master' into f21

[Devan Goodwin]

commit dbd32f862dc979f98d70675d5181af9c9bf0e55f
Merge: a0f5add bea1dfd
Author: Devan Goodwin <dgoodwin at redhat.com>
Date:   Fri Feb 6 15:54:33 2015 -0400

    Merge branch 'master' into f21

 .gitignore       |    1 +
 python-rhsm.spec |   11 ++++++++---
 sources          |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---