Merge branch 'adding_two_possible_time_format'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c9e602f5 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c9e602f5 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c9e602f5 Branch: refs/heads/master Commit: c9e602f5349183aa766bd7feb3e1209668944427 Parents: e838420 a8be700 Author: Maziyar Boustani <[email protected]> Authored: Wed Jun 3 10:10:13 2015 -0700 Committer: Maziyar Boustani <[email protected]> Committed: Wed Jun 3 10:10:13 2015 -0700 ---------------------------------------------------------------------- ocw/utils.py | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
