Merge remote-tracking branch 'origin/bug-1195' into release
authorMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:56:16 +0000 (00:56 +0100)
committerMichael Tänzer <neo@nhng.de>
Tue, 14 Jan 2014 23:56:16 +0000 (00:56 +0100)
commit41e6ea88f5a2a6ac374f26f2239f87e1d7164255
treeadc5f3491472a47c5d8ed2b6decf7de4a39b6035
parentf0f37eabcb2554f78900396248a05cdee1626975
parent2c4c29221f7efcaa98ff3150e8563b2616d143da
Merge remote-tracking branch 'origin/bug-1195' into release