Merge branch 'master' of github.com:KhronosGroup/glslang
authorJohn Kessenich <cepheus@frii.com>
Sat, 19 Dec 2015 18:10:56 +0000 (11:10 -0700)
committerJohn Kessenich <cepheus@frii.com>
Sat, 19 Dec 2015 18:10:56 +0000 (11:10 -0700)

Trivial merge