Update from si-imac.home.simonszu.de (So 14 Jul 2013 11:41:07 CEST)
Merge branch 'master' of github.com:simonszu/dotfiles