Merge pull request #1927 from borgdylan/x86fix
authorZoltan Varga <vargaz@gmail.com>
Mon, 13 Jul 2015 07:52:18 +0000 (03:52 -0400)
committerZoltan Varga <vargaz@gmail.com>
Mon, 13 Jul 2015 07:52:18 +0000 (03:52 -0400)
fix the x86 build


Trivial merge