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
..
2016-03-08 15:52:12 +00:00
2016-02-27 15:23:06 +08:00
2016-03-07 15:42:24 -06:00
2016-02-16 16:45:44 +00:00