Do not convert series when looking at sub-daily frequencies.
Merge branch 'infer_freq' of https://github.com/rockg/pandas into rockg-infer_freq

Conflicts:
	doc/source/whatsnew/v0.15.2.txt