[glpi/el6: 13/13] fix merge

[Remi Collet]

commit c184c251920a8ae9bcc2b553d5f24d88e8f6e8ec
Merge: 3298975 4747702
Author: remi <fedora at famillecollet.com>
Date:   Wed Nov 30 17:43:01 2011 +0100

    fix merge

 .gitignore      |    1 +
 glpi-cron.patch |   47 +++++++++++++++++++++++++++++------------------
 glpi.spec       |   53 ++++++++++++++++++++++++++++++++++++-----------------
 sources         |    2 +-
 4 files changed, 67 insertions(+), 36 deletions(-)
---