Merge branch 'master' of https://github.com/hpd/OpenColorIO-Configs
authorHaarm-Pieter Duiker <hpd1@duikerresearch.com>
Thu, 20 Aug 2015 22:53:55 +0000 (15:53 -0700)
committerHaarm-Pieter Duiker <hpd1@duikerresearch.com>
Thu, 20 Aug 2015 22:53:55 +0000 (15:53 -0700)

Trivial merge