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

[Thomas Moschny]

commit cb66c7200e19da5895c21568fb822dc08c44843a
Merge: de5150c e068032
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Sun Jun 30 12:04:07 2013 +0200

    Merge branch 'master' into el6

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