Michael Stapelberg ef224cdb98 Merge branch 'master' into next
Conflicts:
	testcases/t/173-get-marks.t
2011-12-17 14:22:57 +00:00
..
2011-12-17 14:22:57 +00:00
2011-11-29 22:37:11 +00:00