Merge branch 'release' into bug-782
authorMichael Tänzer <neo@nhng.de>
Sat, 15 Jun 2013 11:40:57 +0000 (13:40 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 15 Jun 2013 11:40:57 +0000 (13:40 +0200)
commiteac1f92e5f27e7c65dfb624744666091ccab328f
tree30bbe367f6b828f62eed30a5ba8ec49e37df0549
parenta3dbfe74d3521763418f44943a7ccfd974bc33bd
parentd2ad5c5c27f4daeabd3f53268cdeab2b706e6e97
Merge branch 'release' into bug-782

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

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