zuni Wed Oct  1 14:41:38 IDT 2014
Merge branch 'master' of github.com:zeltak/dotfiles