Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/devmanual master
authorMarkos Chandras <hwoarang@gentoo.org>
Thu, 24 Jul 2014 18:03:56 +0000 (19:03 +0100)
committerMarkos Chandras <hwoarang@gentoo.org>
Thu, 24 Jul 2014 18:03:56 +0000 (19:03 +0100)

Trivial merge