Merge pull request #2337 from bmiklautz/ci/preloads
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 29 Jan 2015 19:48:06 +0000 (20:48 +0100)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 29 Jan 2015 19:48:06 +0000 (20:48 +0100)
ci update cmake preloads and build fix


Trivial merge