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

[Christopher Meng]

commit adc39556440b9f0fd1dabb4a2870b6bd085fd077
Merge: dd9b720 03decdb
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Sep 12 20:34:54 2013 +0800

    Merge branch 'master' into f19
    
    Conflicts:
    	licq.spec

 .gitignore |    1 +
 licq.spec  |   16 +++++++++-------
 sources    |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
---