Merge branch 'marbre-ipykernel'
authorJustin Lecher <jlec@gentoo.org>
Wed, 6 Jan 2016 07:38:42 +0000 (08:38 +0100)
committerJustin Lecher <jlec@gentoo.org>
Wed, 6 Jan 2016 07:38:42 +0000 (08:38 +0100)
commit46d4237455214d44a2081a5f66621064096ff533
tree8c7d5b05158849c6ccb6816ff664f63b32da16df
parent8d807b3ee76ce84af8e1bdcbbff5b9bfc1089f0b
parentbc363dd82c44bca3c9e13089d917aba5c0c6c995
Merge branch 'marbre-ipykernel'

* marbre-ipykernel:
  dev-python/ipykernel: Version bump