Merge pull request #264 from olebedev/master Russian translation added
Merge pull request #249 from go-martini/JMS-Revert-246 Reverting changes from #246
Merge branch 'master' of github.com:alecthomas/martini into alecthoma… …s-master