Merge branch 'master' of github.com:lifo/docrails
Merge branch 'master' of https://github.com/namsk/docrails