Changes applied: 2013-06-13
Merge branch 'master' of github.com:emzap79/dotfiles