Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 18:08:25 +0000 (19:08 +0100)
committerMichael Tänzer <neo@nhng.de>
Thu, 4 Dec 2014 18:08:25 +0000 (19:08 +0100)
Conflicts:
scripts/send_policy_cca_20140916.php

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

Trivial merge