From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 3 May 2016 16:27:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/d24eae26fe96001540a169eb467c4457e82f0b78

Merge remote-tracking branch 'origin'

* origin:
  dot/ipython_config.py: Let's just have one of these for everywhere.
---

d24eae26fe96001540a169eb467c4457e82f0b78