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

[Christopher Meng]

commit 0fc2e0869f7730a26351fc9723b695a5600d02f0
Merge: 0443475 003e36b
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jun 24 21:27:07 2014 +0800

    Merge branch 'master' into f20

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