Merge remote-tracking branch 'remotes/CraigInches/dispcalGUI'
authorIan Delaney <idella4@gentoo.org>
Sun, 3 Jan 2016 10:57:43 +0000 (18:57 +0800)
committerIan Delaney <idella4@gentoo.org>
Sun, 3 Jan 2016 11:00:02 +0000 (19:00 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/601


Trivial merge