Joe Thornber c2fdbad322 Merge branch '2016-07-07-improve-thin-repair-error-message' into v0.7-devel
Conflicts:
	Makefile.in
	VERSION
	configure.ac
	persistent-data/file_utils.cc
2016-07-11 15:51:30 +01:00
..
2016-07-11 14:53:03 +01:00
2016-07-11 14:53:03 +01:00
2016-07-11 14:53:03 +01:00