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

[Christopher Meng]

commit 0e04c77146ad59ef620ca51707dc489bba53e5fe
Merge: efb3700 4894a53
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat Sep 14 00:25:48 2013 +0800

    Merge branch 'master' into f19

 licq.spec |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)
---