Merge branch 'bug-1070' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 11 Dec 2012 22:56:35 +0000 (23:56 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 11 Dec 2012 22:56:35 +0000 (23:56 +0100)
commit66c4e45e992b285467923f830ba52fd7aa60de46
tree341497556baac356e6aaeb5d14f8ba7b38ea29b2
parent46af74ccb903b92ac6de768934a3faf8d2da45ea
parentd5432de9373b851e78fe9a6cb1f34119e42a1984
Merge branch 'bug-1070' into release