Merge branch 'release' into bug-1195 bug-1195
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:48:07 +0000 (00:48 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:48:07 +0000 (00:48 +0100)
commit2c4c29221f7efcaa98ff3150e8563b2616d143da
treeadc5f3491472a47c5d8ed2b6decf7de4a39b6035
parentb9e886be937d8b8cd4625739968186633d87c36f
parentf0f37eabcb2554f78900396248a05cdee1626975
Merge branch 'release' into bug-1195

Conflicts:
includes/account.php
pages/account/6.php

Signed-off-by: Michael Tänzer <neo@nhng.de>
includes/account.php
pages/account/5.php
pages/account/6.php