Merge remote-tracking branch 'origin/master' into 1.0
[dcpomatic.git] / doc / manual / colour.tex
2013-11-06 Carl HetheringtonVarious manual bits.