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

[Christopher Meng]

commit 28861220c2bc98305ad4dbd698de1c01e9f89574
Merge: 2be39ef 88957f6
Author: Christopher Meng <i at cicku.me>
Date:   Fri Mar 21 14:36:26 2014 +0800

    Merge branch 'master' into el6

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