Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Fri, 4 Dec 2015 15:04:54 +0000 (16:04 +0100)
committerJohn Marino <draco@marino.st>
Fri, 4 Dec 2015 15:04:54 +0000 (16:04 +0100)

Trivial merge