Merge branch 'marbre-notebook'
authorJustin Lecher <jlec@gentoo.org>
Sun, 22 May 2016 17:20:54 +0000 (19:20 +0200)
committerJustin Lecher <jlec@gentoo.org>
Sun, 22 May 2016 17:20:54 +0000 (19:20 +0200)
commit1d6524865bfe1fa2480d698cc3df6c05c71843ca
treefe7d45f0733208987781110e5f0d51b2aeed6fc0
parent1d04a301e05cf727265b56c358de95f75ee03a1d
parentbd00e3ca1b8315b7f4993da7c4fd50d8120c9373
Merge branch 'marbre-notebook'

* marbre-notebook:
  dev-python/notebook: Version bump
  dev-python/nbconvert: Version bump
  dev-python/entrypoints: New ebuild, required for nbconvert