[telepathy-qt4: 5/5] Merge branch 'f16'

[Rex Dieter]

commit 02705ecc80f0ec40507c0d14bf4c310e132b6061
Merge: efc0585 c3faf23
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 19:35:40 2012 -0500

    Merge branch 'f16'
    
    Conflicts:
    	telepathy-qt4.spec

 telepathy-qt4.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---