Merge remote-tracking branch 'origin/bug-790' into release
authorMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:26:02 +0000 (01:26 +0100)
committerMichael Tänzer <neo@nhng.de>
Fri, 5 Dec 2014 00:26:02 +0000 (01:26 +0100)
commit5596d4a37845019c6053c184a94689101a7d48a8
treebbc315fd77ac97821e6f51703476639810185789
parent9e373f974a28e3573a419a069bfeb8ce2503f69d
parent7c3691bce3bfbd46e8e18bd23f0aa566f685c5fe
Merge remote-tracking branch 'origin/bug-790' into release
includes/account.php
pages/account/19.php