[etckeeper/el6: 3/3] Merge branch 'master' into el6

[Thomas Moschny]

commit e5b61b535f168fa9c6bc7d2c28cca4bb524b1318
Merge: cc6bbee 5e8cc18
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Aug 18 07:57:56 2013 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 etckeeper.spec |    9 +++++++--
 sources        |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---