Make buildbot_json.py work even if natsort.py is not available
Raise a config.ConfigErrors if no serverUrl is provided to HttpStatusPush
Stop dropping packets if HttpStatusPush.serverUrl is not set
Merge pull request #387 from maruel/add_post_param

Add optional flag to HttpStatusPush to pass extraparameters to the HTTP ...
Merge pull request #388 from maruel/update_buildbot_json

Update master/contrib/buildbot_json.py
Merge branch 'json_circular_refs' of git://github.com/szager/buildbot

* 'json_circular_refs' of git://github.com/szager/buildbot:
  Fix typo
  Don't use self.level in HelpResource.  'help/' in the URL doesn't trigger HelpResource.
  Eliminate circular references between JsonResource and HelpResource
Merge pull request #380 from tomprince/bug2280

Unregister slaver from PBManager when removing slave.
Don't add a newline to force-build reasons

And also make MailNotifier a bit more resilient to newlines in the
reason.  Fixes #2285.
update CREDITS from git history
expand buildbot_json.py to include the full Chromium license
Capture and log errors during cleanup
Cope if releaseLocks is called multiple times
Merge branch 'pull389' into buildbot-0.8.6

* pull389:
  Cope if releaseLocks is called multiple times
  Capture and log errors during cleanup
Merge branch 'buildbot-0.8.6'

* buildbot-0.8.6:
  Cope if releaseLocks is called multiple times
  Capture and log errors during cleanup
  Add tests for #2280.
  Create a FakeMaster class.
  Unregister slaver from PBManager when removing slave.
Document ShellCommand's initialStdin argument

Fixes #2286.
Merge branch 'interface-tests'

* interface-tests:
  sample use of interface tests
  Add support for interface tests, along with more docs
projectlist gets text from buildstatus if no sourcestamp has a project
Merge branch 'bug2278' into buildbot-0.8.6

Conflicts:
	master/buildbot/test/unit/test_buildslave.py
Pass slave instead of slavebuilder to Real*Lock.getLock.

The function just need the slavename, and when called by BuildSlave,
with a slave lock, there isn't a slavebuilder available.
Merge branch 'bug2278'

Conflicts:
	master/buildbot/test/unit/test_buildslave.py