[reposurgeon/el6: 2/2] Merge branch 'master' into el6

[Christopher Meng]

commit fda0421c2ae2faa1d3a2dd9f83c4bc6767f8f3ac
Merge: 2886122 e3fae78
Author: Christopher Meng <i at cicku.me>
Date:   Wed Apr 30 13:03:13 2014 +0800

    Merge branch 'master' into el6

 .gitignore       |    1 +
 reposurgeon.spec |   13 ++++++++++++-
 sources          |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
---