John Miller 11a95db183 Merge remote-tracking branch 'refs/remotes/origin/master' into org-babel ... # Conflicts: # lisp/ein-core.el		2016-10-15 13:11:38 -05:00
..
nbformat3	Fix issue #35	2015-03-25 09:52:16 -05:00
nbformat4	Merge remote-tracking branch 'refs/remotes/origin/master' into org-babel	2016-10-15 13:11:38 -05:00
.gitignore	For testing reading and writing nbformats v3 (for IPython 2.x) and	2015-01-07 20:50:49 -06:00