Merge remote-tracking branch 'remotes/zpuskas/kicad-doc-4.0.0-rc2'
authorIan Delaney <idella4@gentoo.org>
Mon, 30 Nov 2015 09:15:10 +0000 (17:15 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 30 Nov 2015 09:17:16 +0000 (17:17 +0800)
Cross tested by users username234 and wraeth

Pull request: https://github.com/gentoo/gentoo/pull/419


Trivial merge