From: Ian Delaney Date: Tue, 9 Feb 2016 07:17:35 +0000 (+0800) Subject: Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c018e78723be545c7cbfde686ddd376cd4f584c;p=gentoo.git Merge remote-tracking branch 'remotes/jbergstroem/fix/dev-libs/ucl-conflict' Pull request: https://github.com/gentoo/gentoo/pull/819 --- 0c018e78723be545c7cbfde686ddd376cd4f584c