Merge from vendor branch TNF:
authorobache <obache>
Sat, 6 Aug 2011 13:33:20 +0000 (13:33 +0000)
committerobache <obache>
Sat, 6 Aug 2011 13:33:20 +0000 (13:33 +0000)
commit5b81f48ccf97c57990db3ef89d9952ccd157be0a
treeb6b1693d48f49f579757a145218c63c20fbd556e
parentbd34e9505c219577d9293b09daff851e262eb8b5
parentf328293e0329351d134be025bf3a30df2c900cb6
Merge from vendor branch TNF:
Import ruby-sinatra-1.2.6 as www/ruby-sinatra.

Classy web-development dressed in a DSL.