Merge pull request #824 from voxpupuli/modulesync
modulesync 2.10.0
Merge pull request #823 from bastelfreak/travis
delete legacy travis directory
Merge pull request #828 from olivermussell/master
Fix env_config_path on FreeBSD
Merge pull request #830 from voxpupuli/modulesync
modulesync 2.12.0
Merge pull request #831 from voxpupuli/rewrite-acceptance-tests
Use voxpupuli-acceptance
Merge pull request #833 from fiksn/master
Fix issue #832 - removing federation upstream
Merge pull request #834 from wyardley/wyardley-10_0_1
[chore] release 10.0.1