Merge remote-tracking branch 'remotes/Coacher/fwknop-cleanup'
authorIan Delaney <idella4@gentoo.org>
Mon, 21 Dec 2015 02:33:54 +0000 (10:33 +0800)
committerIan Delaney <idella4@gentoo.org>
Mon, 21 Dec 2015 02:33:54 +0000 (10:33 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/501


Trivial merge