[libreport: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/libreport

[Jiří Moskovčák]

commit cfb74c6bc16b3bf06922550160c0dd3c27d604f9
Merge: 1cc5939 f8de4db
Author: Jiri Moskovcak <jmoskovc at redhat.com>
Date:   Thu Aug 2 13:51:08 2012 +0200

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

 libreport.spec |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --cc libreport.spec
index 583a29e,90b6be9..31ea256
--- a/libreport.spec
+++ b/libreport.spec
@@@ -397,9 -376,8 +397,11 @@@ gtk-update-icon-cache %{_datadir}/icons
  %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
  
  %changelog
 +* Tue Jul 31 2012 Jiri Moskovcak <jmoskovc at redhat.com> 2.0.11-1
 +- new upstream release
 +
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.10-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
  
  * Fri Jun 01 2012 Jiri Moskovcak <jmoskovc at redhat.com> 2.0.10-4
  - fixed build on rhel7