log
Merge branch 'master' of https://github.com/feichan/rails2