Merge branch 'master' into sprint-branch

This commit is contained in:
Armin Ronacher 2013-05-23 14:01:33 +01:00
commit 16df96c552
6 changed files with 17 additions and 74 deletions

View file

@ -9,6 +9,8 @@
:license: BSD, see LICENSE for more details.
"""
from __future__ import with_statement
import sys
from functools import update_wrapper