[telepathy-mission-control: 2/2] Merge branch 'master' into f20

[Brian Pepple]

commit 6969bc429f0ddeb689a47e76c4a4c9a12c79598c
Merge: 1c1c7d4 1b3d1aa
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Oct 30 10:30:03 2013 -0400

    Merge branch 'master' into f20

 ...ager-avatar.py-fix-race-condition-by-comb.patch |   37 ++++++++++++++++++++
 sources                                            |    2 +-
 telepathy-mission-control.spec                     |   33 +++++++++++++++--
 3 files changed, 67 insertions(+), 5 deletions(-)
---