[ffgtk: 5/5] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ffgtk

[Louis Lagendijk]

commit e4ed29a4f8f48cadc78b0bd97e2f293356f42b13
Merge: 289ff97 807e40f
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date:   Tue Jul 31 01:01:02 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ffgtk
    
    Conflicts:
    	ffgtk.spec

 ffgtk.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --cc ffgtk.spec
index c2ab61a,b419829..2d9d38b
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -155,16 -156,10 +155,17 @@@ f
  %{_libdir}/ffgtk/plugins/lib_ab_google.so
  
  %changelog
 +* Tue Jul 31 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-3
 +- Add patch for new evolution dataserver interface
- 
- * Mon Jul 30 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-2
 +- Fix BZ 844149:  Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2.1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jul 10 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-1.1
 +  temporarily disable plugin-evolution due to evolution-dataserver interface changes
 +
 +* Tue Jul 10 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-1
  - New upstream release 0.8.3
  - Add FRITZ!Box 6360 Cable support
  - Add write support to speedfon ab