Merge remote-tracking branch 'remotes/github/pr/45'
authorAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 5 Sep 2015 16:18:57 +0000 (18:18 +0200)
committerAndreas K. Huettel (dilfridge) <dilfridge@gentoo.org>
Sat, 5 Sep 2015 16:18:57 +0000 (18:18 +0200)
commitbbab981b365657a514d91df425e665686b3a93d5
tree0c3df10ca78fcd91675f9758e20888a5efc984b4
parent19b4ea4af28a30f5bd146759ac72cedc59b56736
parentdc09392258df9dcc587b1566dba670c8a0fb87c3
Merge remote-tracking branch 'remotes/github/pr/45'
Closes gentoo/gentoo#45

Fix file collisions between kde4, kdepim and telepathy internationalization