[php-geshi/el5: 12/12] merge with master

[Xavier Bachelot]

commit 21ea1d5021634865161d46b762ab50e929626295
Merge: 9a96eb1 ba8277e
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Sep 9 20:54:44 2012 +0200

    merge with master

 .gitignore     |    3 +++
 php-geshi.spec |   32 +++++++++++++++++++++++++++++---
 sources        |    2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
---