[freetalk/f19: 2/2] Merge branch 'master' into f19

[Christopher Meng]

commit ebc5107858f79f0a935d739ca6a0691fcad75e38
Merge: 756cac5 20fe0ef
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 3 23:33:37 2014 +0800

    Merge branch 'master' into f19

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