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

[Thomas Moschny]

commit 49e326d5a60f1e2bf33baa03cb8476425e061cdd
Merge: d164a8c 7345f87
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Jan 17 17:00:12 2012 +0100

    Merge branch 'master' into el6

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