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

[Christopher Meng]

commit a01b81314bc7f96b3a60c56aeb7019a372b7bc02
Merge: 0fc2e08 40cd767
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 10 00:13:49 2014 +0800

    Merge branch 'master' into f20

 kawa.spec |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)
---