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)
commit30736116cfec98374195654a4f72e7b12a543af5
tree6b4e33a029d9822b14dfac1f7d61020aa9d539be
parent1cc5257aba1e6ae883caf464eaadf25783d2279d
parentb0904b2bda37b292fa5d29d5d3b7ec64d100ad16
Merge branch 'tarballs' into release

Conflicts:
scripts/send_policy_cca_20140916.php

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