Starting owncloud sync
Reclaming key for M-h in org-mode
LaTeX / TeX / XeTeX customisation
Merge branch 'master' of github.com:mgrunwald/dotfiles

Conflicts:
	links/.emacs.d/custom.el