Merge branch 'bug-1102' into release
authorBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 21:48:47 +0000 (23:48 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 25 Jun 2013 21:48:47 +0000 (23:48 +0200)
commit9a81215af81d5c204b98e4771d116cae66c95bb6
tree0111006d390aea3334820a45f7dee1efaaf24927
parentae9db2e099502c9b6d12c40321ea850ce0cf9b55
parent112033ca364acca4e6ead25abd3711c719bdb0dc
Merge branch 'bug-1102' into release