Multiple base directories handling for SaltCacheLoader
Fix not intended name shadowing
Merge remote-tracking branch 'origin/develop' into fix-local-jinja-template-resolution
Fixed jinja_tests.
File roots contains lists of paths for each env.
Merge remote-tracking branch 'upstream/develop' into fix-local-jinja-template-resolution
Fix race contition execption in gitfs
Allow config.option to omit sources
don't load the schedule from the master config
Allow a list of returners to be passed into the scheduler
Add a schedule_returner option
Add scheduler doc
Add jobs to the toc
Kill stray semicolon
Fix an elif issue
Loop over each minion and grab the 'ret' value from the return

Fixed non-existent variable name.
Added list_upgrades function to ebuild module
Merge pull request #3265 from whiteinge/sysdoc-runner

Fix the sys.doc runner
Merge pull request #3268 from shadowfax-chc/ebuild

Added list_upgrades function to ebuild module
Bump version to 0.12.0
Fix undefined ref error