Merge branch 'master' of github.com:rack/rack
authorKonstantin Haase <konstantin.mailinglists@googlemail.com>
Mon, 22 Apr 2013 15:45:12 +0000 (17:45 +0200)
committerKonstantin Haase <konstantin.mailinglists@googlemail.com>
Mon, 22 Apr 2013 15:45:12 +0000 (17:45 +0200)

Trivial merge