lancemanfv/JavaMouseModel — pull request #2 by lancemanfv (2013-11-01 18:47:34+00:00)
Title: Git in conflict

I merged everything through console initially but then I received a mail.