Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Mon, 25 May 2015 08:52:09 +0000 (10:52 +0200)
committerJohn Marino <draco@marino.st>
Mon, 25 May 2015 08:52:09 +0000 (10:52 +0200)

Trivial merge