not sure what changed here
magit
?
ignore errors
fix
fix parameters
no longer needed
initial commit
java + python
Merge branch 'master' of https://github.com/mschuldt/configs

Conflicts:
	dotemacs.org
require ispell
suspend
confirm kill
browse kill ring
another dumb mode change
org-drill
volume adjustment
adjust screen brightness
markdown mode
diff