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

[Thomas Moschny]

commit 41e6de5017500661fe403a5cc4a8b54e0ff91b52
Merge: 49ef61e f3d92f2
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Mar 13 19:58:05 2012 +0100

    Merge branch 'master' into el6

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