Merge branch 'bug-1033' into release
authorMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:38:34 +0000 (00:38 +0200)
committerMichael Tänzer <neo@nhng.de>
Sat, 28 Apr 2012 22:38:34 +0000 (00:38 +0200)
commitaebe99dfea8799e73367d3339d9a30dd7f29fb55
treeb45ddb99fec7eede40f959de817a6bcdf360d062
parent5876c06b559f1738381c2998c5ff53d13760e1e0
parent4452bde4fcbe04e20f97dca573b370ca3e53832a
Merge branch 'bug-1033' into release