# HG changeset patch
# User Dirk Wintergruen <dwinter@mpiwg-berlin.mpg.de>
# Date 1444631905 -7200
# Node ID 1b6cde0e4b835f73681dbe1950fa778478af433d
# Parent  19f75fe342eb53955212a9d7d405be79564d449f# Parent  35c11979b58bcf62ec2db75243f78b83f8656b34
merger

diff -r 19f75fe342eb -r 1b6cde0e4b83 lib/GeoTemCo/platin.js
diff -r 19f75fe342eb -r 1b6cde0e4b83 plugins/tasks/mpiwg_geobrowser_view.inc