Merge or whatever, just bring the framework into the traq repository, no more "submodule" stuff.
It confuzzles people who want to use git to easy-update traq and help with the source.
Its also damn annoying to have to update and create patches for two repositories.
But when you update the framework in it's repository there's no way to have the changes in Traq other then copying them manually. And vice versa, if you'll find a bug in the framework used in Traq and fix it, when you want to have the same fix applied to the framework repo, you'll have to copy it manually.
This was reversed a few months ago.
Done.