Merge branch 'master' into module-support

This commit is contained in:
Armin Ronacher 2010-05-03 20:00:42 +02:00
commit 9da5795d79
3 changed files with 6 additions and 7 deletions

View file

@ -12,7 +12,6 @@
from __future__ import with_statement
import os
import sys
import types
from datetime import datetime, timedelta
from itertools import chain