Merge Markus' git repository so we have the original history

This commit is contained in:
James McCoy 2012-10-26 17:36:59 -04:00
commit 5c600287c7

Diff Content Not Available