Bug fix S3DataTable ORDERBY
Merge branch 'master' of git://github.com/flavour/eden
friendly_string_from_query: update unit test for new parameter format.
Sync filter change must reset last push time.
Merge branch 'master' of git://github.com/flavour/eden
DRMP Stakeholder Profile tweak
Merge branch 'master' of git://github.com/nursix/eden
Bug fix.
Merge branch 'master' of git://github.com/flavour/eden
GIS: stdise on lat_min not min_lat (NB Requires
migration of live sites!)
DRMP Org/Location Profile enhancements.
Merge branch 'master' of git://github.com/flavour/eden
Bugfix Sync/Import: Don't import Location Paths
Merge branch 'master' of git://github.com/flavour/eden
WKT fields need to be larger than 512. Remove redundant check for MySQL
Merge branch 'master' of git://github.com/flavour/eden
Bug fix.
Merge branch 'master' of git://github.com/flavour/eden
Fix Project Search
Merge branch 'master' of git://github.com/nursix/eden

Conflicts:
	VERSION
Merge branch 'master' of git://github.com/flavour/eden