Expose Jinaj2 globals directive
Update docs/async.rst

putting "lambda chunk: body.put(chunk)" makes it feel like there is something misterious going on (are we putting "chunk" is some closure or something?).

And I found it difficult to understand without starting or running the worker.
Update plugins/sqlite/bottle_sqlite.py

Added an optional keyword argument dict 'dbargs' which are passed through to the connect method of the sqlite3 driver
GeventSocketIO support added
BaseRequest MAX_PARAMS attribute can be overriden by ConfigDict
added reloader support to GeventServer
zh-cn doc typo
Fix static route rule in tutorial

It was reported in googlegroups.

https://groups.google.com/d/msg/bottlepy/p9jBFK8DogM/7sOT8hqlke0J
Fixed an error in tutorial file
Merge pull request #554 from iurisilvio/patch-5

Fix static route rule in tutorial
Merge pull request #555 from espern/master

Fixed an error in tutorial file
Merge pull request #553 from cadl/master

zh-CN doc typo
Merge pull request #548 from trololo88/master

BaseRequest MAX_PARAMS attribute can be overriden by ConfigDict
Merge pull request #547 from SmithSamuelM/master

modified the cherrypy adapter to support ssl options
Merge pull request #470 from Alexander-0x80/master

gevent-socketio support added
Merge pull request #550 from dhagrow/master

Added reloader support to GeventServer
Removed the ``BaseRequest.MAX_PARAMS`` limit.

The hash collision bug in CPythons dict() implementation was fixed over a year ago. If you are still using Python 2.5 in production, consider upgrading or at least make sure that you get security fixed from your distributor.
Fixed copyright year.
A faster local_property() implementation.
Merge branch 'master' of /usr/media/marc/0C26910809A69F13/bottle