Update from vpn18178.itmc.tu-dortmund.de (Fr  8 Nov 2013 12:20:33 CET)
Merge branch 'master' of github.com:simonszu/dotfiles