[telepathy-mission-control/f20: 5/5] fix merge

[Peter Robinson]

commit f6bbae46cc9bc5801c34dbff971036bdee008d21
Merge: 4b4bd47 f7d5320
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Aug 29 19:06:26 2014 +0100

    fix merge

 .gitignore                     |    1 -
 sources                        |    2 +-
 telepathy-mission-control.spec |   13 +++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)
---