Merge branch 'master' of github.com:seudut/dotfiles
authorPeng Li <seudut@gmail.com>
Wed, 16 Sep 2015 13:57:58 +0000 (21:57 +0800)
committerPeng Li <seudut@gmail.com>
Wed, 16 Sep 2015 13:57:58 +0000 (21:57 +0800)

Trivial merge