Merge branch 'bug-1176' into release
authorBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:16:37 +0000 (21:16 +0200)
committerBenny Baumann <BenBE@geshi.org>
Fri, 12 Jul 2013 19:16:37 +0000 (21:16 +0200)
commit12ab18c8898d3bd5a62b0aab34842b8463dd9c98
tree8dd6a7841e90864c9f50e08f17ca077689ee60af
parent9a81215af81d5c204b98e4771d116cae66c95bb6
parent9963c51f118a5d11bf245dca15ab2cd716b58633
Merge branch 'bug-1176' into release
includes/general.php
pages/account/43.php