Skip to content

Commit

Permalink
Merge remote-tracking branch 'dahlia/0.4-maintenance' into ipython
Browse files Browse the repository at this point in the history 
Conflicts:
	docs/changes.rst
  • Loading branch information
@emcconville
emcconville committed Apr 20, 2015
2 parents b89a4f3 + 171238b commit 4a08ba7
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 4a08ba7

Please sign in to comment.