splattater/xodx — pull request #2 by white-gecko (2012-12-18 00:43:20+00:00)
Title: Develop update with your commits

Hey Splatte,
I've just merged all your commits from develop into my develop. You merge it into your master to be up to date. Please also make sure you checkout Saft.

If there are merge conflicts you should use my version because I think I have figure them out already.

Nate