[glpi/el6: 2/2] Merge branch 'master' into el6

[Remi Collet]

commit a9afe786d8c75aab6372380cb6a8f927fc114b82
Merge: c184c25 d9ecb0e
Author: remi <fedora at famillecollet.com>
Date:   Thu Jan 5 17:55:28 2012 +0100

    Merge branch 'master' into el6

 .gitignore            |    1 +
 changeset_r16804.diff |   18 ++++++++++++++++++
 glpi.spec             |   12 ++++++++++--
 sources               |    2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)
---