[telepathy-sunshine/f13: 7/7] Merge branch 'f14' into f13

[belegdol]

commit 7bad8ffbe9252172a0612612cc4bb8f4d3e6a6c5
Merge: 49af25f 1e8eb15
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Mon May 30 00:01:51 2011 +0200

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	telepathy-sunshine.spec

 .gitignore              |    1 +
 sources                 |    2 +-
 telepathy-sunshine.spec |    8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)
---