[telepathy-glib/f18: 7/7] Merge branch 'f19' into f18

[Brian Pepple]

commit ec7c6967afdefcfeed0775f3adf6fbe5485a4e4c
Merge: 63341c0 2583ef7
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Thu Jun 20 12:49:32 2013 -0400

    Merge branch 'f19' into f18
    
    Conflicts:
    	.gitignore
    	sources
    	telepathy-glib.spec

 .gitignore          |    1 +
 sources             |    3 ++-
 telepathy-glib.spec |    5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --cc sources
index c4870d9,3c4b0c3..87ef18e
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
- bfc8a1b94c7a268f15d4d92b83460987  telepathy-glib-0.20.2.tar.gz
+ 8a72282ded8dc7341c0c7c57e2f5ee9b  telepathy-glib-0.20.3.tar.gz
++