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

[Xavier Bachelot]

commit 600cbef17b4eea79d1d17fad46461673e601b891
Merge: 28aedf4 5b3d610
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Apr 10 23:21:09 2013 +0200

    Merge branch 'master' into el6

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