merge: fix build & tests with older tooling
authorLubomir Rintel <lkundrak@v3.sk>
Tue, 2 Jun 2015 10:30:51 +0000 (12:30 +0200)
committerLubomir Rintel <lkundrak@v3.sk>
Tue, 2 Jun 2015 10:31:08 +0000 (12:31 +0200)
commit83a82b44899b1ae65a1d25368bd16b559a8f480f
treeb0436c981065d176096a2980a113b3e2930819b5
parent36f7669a4c7799de4bbff4965437df829040a07e
parent84021454eb0b126fda9cf29c46b7860f75c7ff8c
merge: fix build & tests with older tooling