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

[Thomas Moschny]

commit d164a8c06f647f80ca2907fb82a6d82c22957c80
Merge: 4e27d2a 46b3896
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Fri Jan 13 17:36:32 2012 +0100

    Merge branch 'master' into el6

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