12.05.2013, 19:09
Heh, thanks. I've tried to set the fork up to make upstream changes as easy to integrate as possible. I might actually make a new clean fork, set that as upstream for this version and yours as upstream for that version, then I can make changes in there to make them to be pulled either way - up or down stream.