Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict'
authorIan Delaney <idella4@gentoo.org>
Tue, 9 Feb 2016 07:17:35 +0000 (15:17 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 9 Feb 2016 07:17:35 +0000 (15:17 +0800)
commit0c018e78723be545c7cbfde686ddd376cd4f584c
treedfcabf953f4879d4ac654587d9bd8a8fa76dd542
parent74b82266412ce25c4c259e88edd057c68be28f85
parent66973a2eb514ce7bed31ed2799934c80c59c9c34
Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict'

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