Merge branch 'tarballs' into release
authorMichael Tänzer <neo@nhng.de>
Mon, 11 Apr 2011 18:15:06 +0000 (20:15 +0200)
committerMichael Tänzer <neo@nhng.de>
Mon, 11 Apr 2011 18:15:06 +0000 (20:15 +0200)
commita3d7949c04a06539a8a0982968f711b7832d8672
tree4c2caa33b5fcf716d455fec60d38590cfffd5cdb
parente4d11212850f9835c31fa39e70f2422a9118df08
parentb6f8838f587d48502c78d7ed70d768b989ef85fa
Merge branch 'tarballs' into release

Conflicts:
password.dat.sample

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