ivansafrin/Polycode — pull request #338 by CIB (2013-06-07 21:31:46+00:00)
Title: Cleanup of zenx2's pull request

I removed the second commit that said "merging from upstream", but wasn't really merging anything. Not sure what that one was supposed to do.