Merge branch 'color-theme' - change color theme and eshell
authorPeng Li <seudut@gmail.com>
Sat, 19 Dec 2015 15:07:03 +0000 (23:07 +0800)
committerPeng Li <seudut@gmail.com>
Sat, 19 Dec 2015 15:07:03 +0000 (23:07 +0800)

Trivial merge