Merge branch 'release' into bug-1017 bug-1017
authorMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:22:30 +0000 (20:22 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 25 Aug 2013 18:22:30 +0000 (20:22 +0200)
commit2d6e2851a754bbd8d5f5afb0d02bc5caba7d6626
tree96cc8268ba19ee9418ab74c5fbbf7c29dc40cce0
parenteac9744c793d06bc63269952e789a6a30de2e30d
parenta82f507306a9eba8a9f5dff82d2091dbd29edf71
Merge branch 'release' into bug-1017

Conflicts:
pages/account/6.php

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