Merge commit 'e59708bb9d94f67381f19344b5e021591eb711bf'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:33:32 +0000 (19:33 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:33:32 +0000 (19:33 +0000)
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure

diff --cc configure
Simple merge