Merge pull request #3044 from akallabeth/duplicate_define_fix
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Tue, 12 Jan 2016 16:03:35 +0000 (17:03 +0100)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Tue, 12 Jan 2016 16:03:35 +0000 (17:03 +0100)
Fixed broken duplicate define.


Trivial merge