Merge branch 'cmake-eapi-6'
authorMichael Palimaka <kensington@gentoo.org>
Mon, 25 Jan 2016 14:08:44 +0000 (01:08 +1100)
committerMichael Palimaka <kensington@gentoo.org>
Mon, 25 Jan 2016 14:08:50 +0000 (01:08 +1100)

Trivial merge