xtuple/database — pull request #109 by jrogelstad (2012-08-30 21:11:50+00:00)
Title: Fix contact merge conflict.

... get in the way.