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

[Remi Collet]

commit 4da323fcee5d7fcff992828f8207dc523e25e522
Merge: a9afe78 f130d12
Author: remi <fedora at famillecollet.com>
Date:   Thu Jan 5 22:26:28 2012 +0100

    Merge branch 'master' into el6

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