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

[Thomas Moschny]

commit 296c4686c6f79d041f640872f12ba37fc8aae49f
Merge: e53e0aa eeb766f
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Nov 9 13:22:34 2011 +0100

    Merge branch 'master' into el6

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