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)
commit38d8ae922c1472bad3b57269c97537b07959d2ea
tree29bd592e5bbe151f892cd297c0b418afebfd4322
parentaba34728a556c0e83658b91bf425d9e9d3d7af81
parentf7484beb1ecc6d7d8cf8d31eee792bd4ba540aec
Merge branch 'tarballs' into release

Conflicts:
scripts/db_migrations/version2.sh (file permissions)

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