commit b5493569b2e537424cc1bc1c0203a5c394d1fbfa
Merge: d0d5ae3 dfd494a
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Thu Sep 29 10:09:08 2011 -0400
Fix merge conflicts.
.gitignore | 1 +
sources | 2 +-
telepathy-gabble.spec | 11 +++++++----
3 files changed, 9 insertions(+), 5 deletions(-)
---