Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Revert "[don't merge!!] Add six dependency notice to building docs intructions"
Adding missing docs for using cron like format for scheduler
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Fix undefined variable
Fix invalid syntax
Update 'doc/.tx/config' - Build #213

  http://cookingwithsalt.org/job/salt/job/transifex/213/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge branch '2014.7' into develop

Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
use event factory functions
Dos 2 unix line breaks. Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`
Switch `open()` for `salt.utils.fopen()`