tree 02c315dc429c31c7c008de28ed2443b8561212c5
parent 863d00f860cf36b9355f18f3d24186c0fb9cd2be
parent 222d745e8023772bf9be38b907e0a7089ac86da1
author Harbs <harbs@in-tools.com> 1417076886 +0200
committer Harbs <harbs@in-tools.com> 1417076886 +0200

Merge branch 'develop' into tables

* develop:
  the original change broke a few tests.  I think this one is better