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

[Thomas Moschny]

commit 49ef61e226ea74cf9e5faef82ed1f1067c8bab0b
Merge: 49e326d 8b4b3d2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Mar 13 19:38:35 2012 +0100

    Merge branch 'master' into el6

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