chiark / gitweb /
Merge remote-tracking branch 'origin'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 3 May 2016 16:27:17 +0000 (17:27 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 3 May 2016 16:27:17 +0000 (17:27 +0100)
commitd24eae26fe96001540a169eb467c4457e82f0b78
treef2c3ca974a07289bcfb33f1e20aa8cc010c9f6ea
parent5f454d3e0c3c1fbc179aedcedcfe4ee191f171c2
parent580ac7ce11353166bdfa83283e6b51f282135dfe
Merge remote-tracking branch 'origin'

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