Merge branch 'bug-1276' into release
authorBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:29:44 +0000 (22:29 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 20 Aug 2014 20:29:44 +0000 (22:29 +0200)
commitbe3c7c9559e887db82a8a4c5d7c54ec66536fbe6
tree6676f3ed1a321a49b46b62fbfd6825550a85224a
parent3641ed05c58e2f350bc33cef737a0c35755364eb
parente6841da67c49d86377aa5454f8be3c5f432235eb
Merge branch 'bug-1276' into release