wingedmonkey/wingedmonkey — pull request #7 by jtomasek (2012-11-15 14:27:18+00:00)
Title: Merge blomquisg branch with wingedmonkey/master

This pull request brings the wingedmonkey/master up to date with wingedmonkeyblomquisg branch