Merge branch 'marbre-glm'
authorJustin Lecher <jlec@gentoo.org>
Wed, 16 Sep 2015 08:57:06 +0000 (10:57 +0200)
committerJustin Lecher <jlec@gentoo.org>
Wed, 16 Sep 2015 08:59:02 +0000 (10:59 +0200)
* marbre-glm:
  media-libs/glm: Fix remote-id
  media-libs/glm: Version bump, fixes #553156 and #538294
  licenses: add HappyBunny license

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=553156
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=538294

Closes: Github gentoo/gentoo#83
Signed-off-by: Justin Lecher <jlec@gentoo.org>

Trivial merge