Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 20:01:16 +0000 (22:01 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 20:01:16 +0000 (22:01 +0200)
commited332a25dedba4b372d45e4bc4d5276d96d6ae38
treea729a7db62de574e24b927dca1bd35dc815161cf
parente3ac4c85d6c95f55835acb681dc2c4103730933f
parent9d4ec70dda220ab42c013de4313d26b3914ba668
Merge branch 'tarballs' into release

Conflicts:
includes/account.php

Signed-off-by: Michael Tänzer <neo@nhng.de>