3 Commits

Author	SHA1	Message	Date
Tim Bentley	945a99ea24	Fix up merge issues	2013-05-19 08:35:07 +01:00
Tim Bentley	0ef65fb8d2	minor fixes	2013-04-23 20:17:25 +01:00
Tim Bentley	fba86c5552	Add tests	2013-04-23 20:08:07 +01:00