Merge branch 'master' of github.com:vu3rdd/.emacs.d
authorRamakrishnan Muthukrishnan <ram@leastauthority.com>
Sat, 3 Jan 2015 14:05:02 +0000 (19:35 +0530)
committerRamakrishnan Muthukrishnan <ram@leastauthority.com>
Sat, 3 Jan 2015 14:05:02 +0000 (19:35 +0530)
1  2 
init.el

diff --cc init.el
Simple merge