Merge branch 'bug-602' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:52:36 +0000 (19:52 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:52:36 +0000 (19:52 +0200)
commit237698fa4180bb3fdfa74469f690537df8bd422f
tree238e4f1fa9cbd7884b242df5e442dc424ef5967b
parentfe7668ffcc5aecfb6929bada95b9f1e0e98b47d2
parent4e8d7d5808c7fb59a294fca0328c92f2d9715f35
Merge branch 'bug-602' into release