Chris McDonough 5617f4c653 fix merge conflicts

2013-08-17 09:35:29 +02:00

..

__init__.py

test the iso8601 package and add a licensing exception

2012-02-04 10:18:44 -05:00

test_colander.py

fix merge conflicts

2013-08-17 09:35:29 +02:00

test_iso8601.py

default_timezone was completely untested

2013-08-16 13:16:26 +02:00