Merge branch 'master' into truecolor

This commit is contained in:
Magnus Norddahl 2016-06-27 12:27:08 +02:00
commit 572d81fcd8

Diff content is not available