[i3lock/f20: 2/2] Merge branch 'master' into f20

[Christopher Meng]

commit 8e2c86f28c2bcc1690a3643efece5381a0cf869c
Merge: daf77af 60e7c36
Author: Christopher Meng <i at cicku.me>
Date:   Wed Jul 30 09:41:14 2014 +0800

    Merge branch 'master' into f20

 i3lock.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---