Commit graph

2 commits

Author SHA1 Message Date
John Miller
0d328470b3 What a waste of a commit. 2017-03-04 21:07:52 -06:00
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