[Buildbot-commits] [buildbot/buildbot] 78b262: Merge branch 'sphinx-buildstep' of git://github.co...

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot

  Commit: 78b262cc1e6d1d7c4fa06a82f59f69c2db538bbf
      https://github.com/buildbot/buildbot/commit/78b262cc1e6d1d7c4fa06a82f59f69c2db538bbf
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2011-08-23 (Tue, 23 Aug 2011)

  Changed paths:
    M master/buildbot/steps/python.py
  M master/buildbot/test/unit/test_steps_python.py
  M master/docs/manual/cfg-buildsteps.rst

  Log Message:
  -----------
  Merge branch 'sphinx-buildstep' of git://github.com/benallard/buildbot

* 'sphinx-buildstep' of git://github.com/benallard/buildbot:
  Add documentation for the Sphinx step
  Sphinx: Make the tests pass
  more/better tests, uncovering some failures
  Add a test for the Sphinx BuildStep.
  Add a Sphinx BuildStep

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