Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 12 Feb 2013 23:05:03 +0000 (00:05 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 12 Feb 2013 23:05:03 +0000 (00:05 +0100)
Conflicts:
scripts/db_migrations/version2.sh (file permissions)

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

Trivial merge