Update from vpn61100.itmc.tu-dortmund.de (Mo  2 Dez 2013 15:22:41 CET)
Fixed some conflicts
Merge branch 'master' of github.com:simonszu/dotfiles