[Buildbot-commits] [buildbot/buildbot] 88899b: Merge branch 'bug972' of git://github.com/jollyrog...

[noreply at github.com]

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

Commit: 88899b1364bfc14df3f7cc77b66087846e731a73
    http://github.com/buildbot/buildbot/commit/88899b1364bfc14df3f7cc77b66087846e731a73
Author: Dustin J. Mitchell <dustin at zmanda.com>
Date:   2010-08-20 (Fri, 20 Aug 2010)

Changed paths:
  M master/NEWS
  M master/buildbot/scripts/runner.py

Log Message:
-----------
Merge branch 'bug972' of git://github.com/jollyroger/buildbot

* 'bug972' of git://github.com/jollyroger/buildbot:
  Fixing conflicting command-line options.