Soliah/dotfiles — pull request #4 by Soliah (2013-03-07 11:34:03+00:00)
Title: Update upstream.

Update upstream but ignore changes that don't apply to the original.