Commit 948e21907595de582d5177e29665d2bf4801c20b

William Pitcock 2012-05-11T20:32:32

tests: add tests for 'conflicts' field (issue #13)