mattbasta/ivote-teama — pull request #175 by bashtech (2012-05-01 02:34:33+00:00)
Title: Conflict2

Hopefully this will fix issue #168 and maybe some of the conflict resolution steps.