Merge branch 'release' into bug-1123 bug-1123
authorMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:46:28 +0000 (00:46 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 24 Aug 2013 22:46:28 +0000 (00:46 +0200)
commitb3f92f6473bc302bddb5efe7f3b6e200625cfacb
tree1a4310594093c7d65b60509eadef34109f114c36
parentc6fd753005d2651382fc8aa21933376225035a31
parenta82f507306a9eba8a9f5dff82d2091dbd29edf71
Merge branch 'release' into bug-1123

Conflicts:
includes/account.php
pages/account/10.php
pages/account/3.php
pages/gpg/0.php
www/gpg.php

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