am 3b2ba81b: (-s ours) DO NOT MERGE. Remove obsolete TradeFederation from this branch.

Merge commit '3b2ba81b390a25f0d55eb7f1e3444ac0e61de510' into kraken

* commit '3b2ba81b390a25f0d55eb7f1e3444ac0e61de510':
  DO NOT MERGE. Remove obsolete TradeFederation from this branch.
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.