[Buildbot-commits] [buildbot/buildbot] d4cedf: Merge branch 'bug2122' of git://github.com/tomprin...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: d4cedf867068a3c28c94e91b4a3f640fdeba8fe9
      https://github.com/buildbot/buildbot/commit/d4cedf867068a3c28c94e91b4a3f640fdeba8fe9
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M master/buildbot/steps/shell.py
  M master/buildbot/test/unit/test_steps_shell.py

  Log Message:
  -----------
  Merge branch 'bug2122' of git://github.com/tomprince/buildbot

* 'bug2122' of git://github.com/tomprince/buildbot:
  ShellCommand.describe(): Ignore AttributeError

Conflicts:
	master/buildbot/steps/shell.py