Merge branch 'release-0.1.2' into develop
dummy commit to trigger travis build
dummy commit to trigger travis build again
replaced copy of rr by new version of this npm module
Merge branch 'develop' of https://github.com/Horsed/brokowski into develop
increased version of mocha
trying to fix travis-ci builds: changed host name in tests from localhost to 127.0.0.1
trying to fix travis-ci build: removed all test scripts but one
trying to fix travis-ci build: restored one test script to see if it makes the build fail
trying to fix travis-ci build: restored another test script to see if the build still fails
trying to fix travis-ci build: separated trestBroker.js to see if it made the build fail
trying to fix travis-ci build: now all test scripts but testBroker.js are run
trying to fix travis-ci build: restored testBroker.js and made broker no longer inheriting from EventEmitter2 but using an instance of it
trying to fix travis-ci build: broker inherits from node's builtin EventEmitter
trying to fix travis-ci build: implemented basic own event emitter functions to check if node's builtin EE or EE2 caused the builds to fail
removed toobusy; trying to fix travis-ci build: renamed http parameter of event callback to maybe avoid that in tests the real http module gets used
trying to fix travis-ci build: commented out one broker test where the real http module gets used
trying to fix travis-ci build: it was the test for handling broken subscribers! changed that test and the regarding error handling in the broker
Merge branch 'hotfix-broken-build-on-travis-ci'
Merge branch 'master' of https://github.com/Horsed/brokowski

Conflicts:
	.travis.yml