James Booth e78684f689 Tests: longer timeout for failing functional test on travis

2016-09-26 00:16:12 +01:00

..

functionaltests

Tests: longer timeout for failing functional test on travis

2016-09-26 00:16:12 +01:00

unittests

Merge branch 'master' into win-order

2016-09-25 23:32:15 +01:00