Merge branch 'setuptools-trial' of git://github.com/msabramo/buildbot

* 'setuptools-trial' of git://github.com/msabramo/buildbot:
  Add support for tox (http://tox.testrun.org/) for quick local testing across multiple Pythons.
  Make `python setup.py test` work (in a fresh virtualenv!) for buildbot/master
  Make `python setup.py test` do something useful
git-describe: update release notes; also fix a misplaced note for the 'descriptionSuffix' change
Merge branch 'git-describe' of git://github.com/jaredgrubb/buildbot

* 'git-describe' of git://github.com/jaredgrubb/buildbot:
  git-describe: update release notes; also fix a misplaced note for the 'descriptionSuffix' change
  git-describe: update docs; adjust behavior of 'dict()'
  Fixes #2180: Allow for "git describe" in addition to got_revision
Fixes #2165: Add 'ternary' interpolation for WithProperties
Merge branch 'multirepo-doc' of git://github.com/hborkhuis/buildbot

* 'multirepo-doc' of git://github.com/hborkhuis/buildbot:
  rewriting of some sentences multiple-tree concept (by Benoit)
  document that by default schedulers only accept changes with an empty sourcestamp
  added the concept of multiple repositories to documentation

Conflicts:
	master/docs/release-notes.rst
ternary-sub: add docs
ignore detritus from 'python setup.py test'
Apply some editing to the concepts documentation
Merge branch 'ternary-interpolation' of git://github.com/jaredgrubb/buildbot

* 'ternary-interpolation' of git://github.com/jaredgrubb/buildbot:
  ternary-sub: add docs
  Fixes #2165: Add 'ternary' interpolation for WithProperties
clarify docs as to how :#? and :? differ
remove duplicate tests
update docs regarding empty repository string - refs #913.
Merge branch 'magic-__new__'

Conflicts:
	master/buildbot/steps/master.py
	master/buildbot/steps/shell.py
	master/buildbot/steps/source/base.py
	master/buildbot/steps/source/git.py
	master/buildbot/steps/source/svn.py
	master/docs/developer/cls-buildsteps.rst
Add initial implementation of NightlyTriggerable.

This scheduler responds to Trigger steps, but only builds the most
recently triggered source stamp, when a timer fires.
Factor out NightlyBase tests into a separate file.
Add tests for NightlyTriggerable.
Add utility function to recreate a Properties object from the result of .asDict().
Make NightlyTriggerable persist last trigger information.
Add tests for properties to NightlyTriggerable.
Add documentation for NightlyTriggerable.