Merge remote-tracking branch 'danvk/292-squash' into utc_datetime_labels-issue_498-v2
authorJoan Pau Beltran <joanpau.beltran@socib.cat>
Mon, 27 Oct 2014 15:18:00 +0000 (11:18 -0400)
committerJoan Pau Beltran <joanpau.beltran@socib.cat>
Mon, 27 Oct 2014 15:29:59 +0000 (11:29 -0400)
commitb4c7f0ad4b0e91eb39b84fc10066dc7e1a6ed4f6
tree19546071356286da976ee432cd9c09b446d97b12
parent284ac95b940485ba0fa463c693f1ca736e9ac987
parent872a6a00621c7e18800f75a384b52b88fe751391
Merge remote-tracking branch 'danvk/292-squash' into utc_datetime_labels-issue_498-v2

This is an squash and rebase onto last version of master.
Some minor changes added as per comments in the PR.