Joe Thornber 8b2ec7a3aa Merge branch 'master' into v0.7-devel
Conflicts:
	VERSION
	persistent-data/space-maps/disk.cc
	persistent-data/space-maps/disk.h
2016-03-22 12:04:51 +00:00
..
2015-08-19 12:32:57 +01:00
2015-08-19 12:32:57 +01:00
2013-08-15 16:26:17 +01:00
2014-09-08 11:07:46 +01:00
2013-05-28 12:59:17 +01:00