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)
* marbre-notebook:
  dev-python/notebook: Version bump
  dev-python/nbconvert: Version bump
  dev-python/entrypoints: New ebuild, required for nbconvert


Trivial merge