Revert "Merge remote-tracking branch 'origin/wip-jlindgre-timehandling' into integration-1.2"
Compilation is failing on Fedora20. This reverts commit 44dd3580, reversing changes made to a36db7aa.
This diff is collapsed.
Compilation is failing on Fedora20. This reverts commit 44dd3580, reversing changes made to a36db7aa.