Commit 9cadbaba0243

Vincent Demeester <vincent+git@demeester.fr>
2014-03-02 20:52:13
Merge branch 'master' of github.com:vdemeester/emacs-config
Conflicts: .emacs.d/el-get.conf.el
main
2 parents a77306e , 1acbbe8
Changed files (0)
(no files)