From: Andreas K. Huettel (dilfridge) Date: Sat, 5 Sep 2015 16:18:57 +0000 (+0200) Subject: Merge remote-tracking branch 'remotes/github/pr/45' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bbab981b365657a514d91df425e665686b3a93d5;p=gentoo.git Merge remote-tracking branch 'remotes/github/pr/45' Closes gentoo/gentoo#45 Fix file collisions between kde4, kdepim and telepathy internationalization --- bbab981b365657a514d91df425e665686b3a93d5