Merge remote-tracking branch 'alexandre/syntaxhighlighter'
authorJean Privat <jean@pryen.org>
Fri, 7 Feb 2014 13:44:34 +0000 (08:44 -0500)
committerJean Privat <jean@pryen.org>
Fri, 7 Feb 2014 13:44:34 +0000 (08:44 -0500)

Trivial merge