Merge branch '2.3.x_2.10' of github.com:scalatra/scalatra into 2.3.x_2.10
Merge branch '2.3.x_2.10' of github.com:scalatra/scalatra into 2.3.x_2.10
Set response charset just before rendering response only when it's not specified.
Merge branch '2.3.x_2.10' of github.com:scalatra/scalatra into 2.3.x_2.10
Fixes RedisScalatraBroadcaster's Entry push with updated atmosphere version
Fixes 'Using Broadcaster' logging statement on initialization
Merge pull request #333 from jgrowl/2.3.x_2.10

Fix for scalatra-atmosphere module compilation error
Upgrade to ScalaTest 2 and Specs2 2.
Merge pull request #332 from takezoe/fix-response-charset

Scalatra always returns Content-Type with charset=UTF-8
Fix issue #321: the result of a Future can be another Future, so we unroll them until we have an actual result
Release note.
Fix Jetty uninitialized value error.
Clean up some import warnings.
Merge branch '2.2.x_2.9' into 2.2.x_2.10

Conflicts:
	core/src/main/scala/org/scalatra/FutureSupport.scala
Scalate template path should be normalized
Merge branch '2.2.x_2.9' into 2.2.x_2.10
Issue #335 in release notes
Merge branch '2.2.x_2.9' into 2.2.x_2.10
Merge branch '2.2.x_2.10' into 2.3.x_2.10
Revert "Set response charset just before rendering response only when it's not specified."

Will bring something like this back when we've fixed the tests.

This reverts commit 8830c9a18591f8fa71d49a45284d1cc1ae903203.