Update from si-imac.home.simonszu.de (Do 27 Jun 2013 18:31:52 CEST)
Merge branch 'master' of github.com:simonszu/dotfiles