Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Added Gentoo support for timezone module
Pass on the given env
Merge pull request #3153 from shadowfax-chc/timezone

Added Gentoo support for timezone module
Update doc/topics/event/index.rst

default sock_dir was changed. Updated this doc to work with new location.
Added makeconf module

Manages setting values in the Gentoo make.conf file
Merge pull request #3154 from torhve/develop

Pass on the given env
Added functions to append and trim vars in makeconf
Added cflags functions to modify cflags variable
Made var_contains actually work
Added functions for common variables in make.conf
Added docs for makeconf module
Fixed bug in layman.list_local

If no overlays had been added, layman.list_local would fail with
IndexError