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

[Alex Wood]

commit a7ff384af0ce7b183b10f807399a3279af480ebe
Merge: 4b98a05 c363e9f
Author: Alex Wood <awood at redhat.com>
Date:   Thu Oct 23 17:01:37 2014 -0400

    Merge branch 'master' into f21

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