Merge branch 'master' of https://github.com/pandas-dev/pandas into meta

pandas/tests/test_base.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
+from datetime import datetime, timedelta
 import inspect
 import re
 import sys