[linode-cli/epel7: 3/3] Merge branch 'master' into epel7

[Christopher Meng]

commit a0f385f7795482ee32f0d70e4fa5943dce4caaca
Merge: a38ee15 f881342
Author: Christopher Meng <i at cicku.me>
Date:   Tue Feb 3 14:59:20 2015 +0800

    Merge branch 'master' into epel7

 .gitignore      |    1 +
 linode-cli.spec |   11 +++++++++--
 sources         |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---