Merge pull request go-martini#264 from olebedev/master

Russian translation added

Merge pull request go-martini#249 from go-martini/JMS-Revert-246

Reverting changes from go-martini#246

Merge branch 'master' of github.com:alecthomas/martini into alecthoma…

…s-master