[php-geshi/el5: 3/3] Merge branch 'master' into el5

[Xavier Bachelot]

commit a35df3af643403b36588bdebfc7abc8e9f8d00cd
Merge: 21ea1d5 5b3d610
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Apr 10 23:21:50 2013 +0200

    Merge branch 'master' into el5

 php-geshi.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---