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)
1  2 
includes/account.php
pages/account/19.php

Simple merge
Simple merge