[glpi: 2/2] fix merge

[Remi Collet]

commit f3e7d069e8bb24ace121b608939911c258184536
Merge: f94555c a6b9c05
Author: remi <fedora at famillecollet.com>
Date:   Sat Jun 11 07:14:50 2011 +0200

    fix merge

 glpi.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc glpi.spec
index 368abbf,b9437f1..94edcec
--- a/glpi.spec
+++ b/glpi.spec
@@@ -245,9 -233,9 +245,12 @@@ f
  
  
  %changelog
 +* Sat Jun 11 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.78.5-1
 +- version 0.78.5 released
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.72.4-4.svn11497
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Thu May 20 2010 Remi Collet <Fedora at FamilleCollet.com> - 0.72.4-3.svn11497
  - use system phpCAS instead of bundled copy
  - minor bug fixes from SVN