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

[Thomas Moschny]

commit de5150c00ae097d608234d2bffb9b763ab6d9c3c
Merge: 41e6de5 c20c38b
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Mon Jun 4 19:22:12 2012 +0200

    Merge branch 'master' into el6

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