[telepathy-gabble: 2/2] Merge master ChangeLog

[Brian Pepple]

commit 01ae5f6be524ac8fc6353d0b655ac476d04e0962
Merge: 4af5418 05370d1
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Sep 29 19:07:10 2010 -0400

    Merge master ChangeLog

 telepathy-gabble.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc telepathy-gabble.spec
index 9ca60e1,4703ab6..57d4d50
--- a/telepathy-gabble.spec
+++ b/telepathy-gabble.spec
@@@ -65,9 -65,9 +65,12 @@@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}
  
  
  %changelog
 +* Wed Sep 29 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.10.1-1
 +- Update to 0.10.1.
 +
+ * Wed Sep 29 2010 jkeating - 0.10.0-2
+ - Rebuilt for gcc bug 634757
+ 
  * Thu Sep 23 2010 Brian Pepple <bpepple at fedoraproject.org> - 0.10.0-1
  - Update to 0.10.0.
  - Add requires on tp-mission-control. Refer to NEWS file.