Merge branch 'misc-long-term-test-fixes' into devel
commitffc0b1efe79243b92c5eec86da61e1bea0e0c6f4
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:55 +0000 (10 10:11 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:55 +0000 (10 10:11 +0100)
tree4458a0fc3e2030ddcb0a152fd644af9aec623c28
parent67b1edc3c5554f4f465329ada79684a790f09c8b
parent9cb84d6263a454e1586cfed4b0f21376eec3f020
Merge branch 'misc-long-term-test-fixes' into devel