I'm sure we can work something out
Its been mentioned elsewhere here, but you should probably think about having copyright assignment before accepting third party (non-plugin) patches, so that you can continue to work something out with people in the future too.