Fix to ticket #2310: make loadConfig check for a configfile path in the .tac file if the default location doesn't exist
Add a test that getting the config file path from the .tac file works
Address code review comment: https://github.com/buildbot/buildbot/pull/673#issuecomment-15095930 and fall back to the .tac config location before calling loadConfig
rebuild the sqlite DB on sqlite-3.6.20 for compatibility
Fix the way in which we fail with unfound configs to pass the unit tests. loadConfig must take a full path, not try to prepend the basedir, because it may take a fully qualified path as specified in the .tac.
Fix the "checking" message in upgrade-master to accommodate a config file from the .tac
Move .tac-fallback unit tests to test_scripts_base; reinstate basedir prepending to filename in loadConfig
Merge branch 'ticket2310' of git://github.com/imccowan/buildbot
Added optimization chapter to master manual.
For now it contains a snippet on speeding up properties load from a database if the properties are strings
Merge branch 'docs_optimization_chapter' of git://github.com/JustAMan/buildbot
fix test failures on mock==0.7.2
fix test failures on mock==0.6.0
Added caching the results of getRecentBuilds() method - should speed up grid page generation
fix pyflakes
Merge branch 'grid_speedup' of git://github.com/JustAMan/buildbot
Add SetProperty build step
Rename SetProperty step in buildbot.steps.shell to SetPropertyFromCommand
maildir bug fixed, allowed maildir to be started and stopped repeatly

Fixes #2475
Merge branch 'maildir_bug' of git://github.com/jbotto/buildbot
changed the unit test to AssertEqual