Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:52:48 +0000 (19:52 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 27 Jan 2016 19:52:48 +0000 (19:52 +0000)
commit3662e55943d3b3dd351eb683f5abfbca01952f5c
treec5590a2a8278a31be7e5989887d12a5f996adc59
parent97d57424344fafd14a5893b33b205b974272a7a6
parente93aa2c9e7b3599aee6a5820760fc1a2c629dea0
Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
configure