[xlockmore/el6: 5/5] Merge branch 'master' into el6

[Adrian Reber]

commit ee5b16e12f86b991f17f340a085abbbb410b2657
Merge: c597ab0 cce6ab3
Author: Adrian Reber <adrian at lisas.de>
Date:   Thu Jul 18 21:05:51 2013 +0200

    Merge branch 'master' into el6

 .gitignore     |    1 +
 sources        |    2 +-
 xlockmore.spec |   26 ++++++++++++++------------
 3 files changed, 16 insertions(+), 13 deletions(-)
---