Merge branch 'bug-1177' into bug-893
authorBenny Baumann <BenBE@geshi.org>
Sun, 21 Jul 2013 20:33:04 +0000 (22:33 +0200)
committerBenny Baumann <BenBE@geshi.org>
Sun, 21 Jul 2013 20:33:04 +0000 (22:33 +0200)
commiteb288d6caa7426f24f28cb647fd5e9f451c26d23
tree80af1dbd5866f545481ffcf95f8ca51222517c5d
parent4173e38402f9cd765828dd5bd59771f1e31db96e
parentc8a190e3abfbd4f4422e04baf4c869bf8ce87fac
Merge branch 'bug-1177' into bug-893

Conflicts:
includes/account.php
includes/account.php
www/disputes.php