Merge branch 'bug-1171' into release
authorBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:58:58 +0000 (19:58 +0200)
committerBenny Baumann <BenBE@geshi.org>
Mon, 13 May 2013 17:58:58 +0000 (19:58 +0200)
commitdb0e084bdced689e15246b97fdea7bd85e299bef
tree76d521501f06ec9df311a9fb79da622d41821253
parentc7e62bb54f7ee4214d5f50cf92192b53dfb993d0
parent473373dc3708a0f14a0eb569a9f2b07c3e14aaec
Merge branch 'bug-1171' into release