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

[Christopher Meng]

commit d8924c70ba81aefe625fa77587dee31812cd1785
Merge: 1cb9c65 20fe0ef
Author: Christopher Meng <i at cicku.me>
Date:   Thu Jul 3 23:33:24 2014 +0800

    Merge branch 'master' into f20

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