Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'boshiamy_im' into develop
Merge branch 'master' into develop
Merge branch 'boshiamy_im' into develop
Merge branch 'boshiamy_im' into develop
Merge branch 'boshiamy_im' into develop
Merge branch 'master' into develop: fix old .bashrc & .tcshrc
[.vim/vimrc] temporary remove riv.vim (editing list not so convenient)
Merge branch 'boshiamy_im' into develop
Merge branch 'master' into develop
Merge branch 'rst' into develop
Merge branch 'rst' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
Merge branch 'master' into develop
20141112 merge master
Merge branch 'boshiamy_im' into develop
Merge branch 'boshiamy_im' into develop
Merge branch 'master' into develop