[php-geshi/el6: 11/11] merge with master

[Xavier Bachelot]

commit 28aedf4c64e0a455c26bc4303b15c4d2a23d97be
Merge: 0cf8451 ba8277e
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Sep 9 20:51:12 2012 +0200

    merge with master

 php-geshi.spec |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---