Merge branch 'marbre-ipython'
authorJustin Lecher <jlec@gentoo.org>
Thu, 17 Sep 2015 18:37:02 +0000 (20:37 +0200)
committerJustin Lecher <jlec@gentoo.org>
Thu, 17 Sep 2015 18:37:50 +0000 (20:37 +0200)
* marbre-ipython:
  dev-python/ipython: Fix security issue

Github: Closes gentoo/gentoo#100

Signed-off-by: Justin Lecher <jlec@gentoo.org>

Trivial merge