Merge branch 'vendor/GCC50'
authorJohn Marino <draco@marino.st>
Fri, 17 Apr 2015 10:57:20 +0000 (12:57 +0200)
committerJohn Marino <draco@marino.st>
Fri, 17 Apr 2015 10:57:20 +0000 (12:57 +0200)

Trivial merge