mirror of
				https://github.com/larstvei/dot-emacs.git
				synced 2025-11-04 01:20:11 +00:00 
			
		
		
		
	Merge branch 'master' of github.com:larstvei/dot-emacs
Conflicts: README.org
This commit is contained in:
		
						commit
						94f40ea318