OpenTreeMap/OTM2 — pull request #1827 by RickMohr (2014-12-04 16:22:22+00:00)
Title: Fix merging of i-Tree code field

* When storing an i-Tree pair, use `(region, code)` instead of `(code, region)`
* When detecting diffs, use string version of i-Tree code field rather than pair version
* When displaying a diff, for the "imported value" use the value in the diff rather than the value in the row
* Fix `collected_fields` logic in `views._get_row_data`