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

[Christopher Meng]

commit 04434754e4ca2c35ed3ceeb0547ee840f68d1486
Merge: 409fe09 98c084a
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jun 24 21:04:42 2014 +0800

    Merge branch 'master' into f20

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