liqd/adhocracy — pull request #800 by xi (2014-03-12 19:04:40+00:00)
Title: Update geo

I tried to merge develop into geo. However I have no running geo installation to test this.