Update from si-imac.home.simonszu.de (Di 16 Jul 2013 16:38:41 CEST)
Merge branch 'master' of github.com:simonszu/dotfiles