Update 'doc/.tx/config' - Build #152

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

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
Merge pull request #15294 from kellya/develop

Added some very basic information about actually writing grains in the
Merge pull request #15301 from cachedout/pillar_merge

Docs on merging pillar keys
Merge pull request #15302 from s0undt3ch/hotfix/transifex-updates

Hotfix/transifex updates
Merge pull request #15298 from terminalmage/update-release-notes

Normalize the 2014.7.0 release notes
Merge pull request #15299 from terminalmage/update-release-notes-2014.7

Normalize the 2014.7.0 release notes
Make --list-profiles argument more intuitive
Fix failing integration tests for the wheel client
Merge remote-tracking branch 'upstream/2014.7' into develop
Pass in user-defined or salt-cloud profile name to --list-profiles
disk: /etc/mtab is only used on Linux.
Implement password aging info for all BSDs.
groupadd: fix and implement missing functions for OpenBSD

gpasswd is only available on Linux and groupadd(8) does not support `-r'
on OpenBSD.
Add OpenBSD support for deluser() and memebers().
Merge pull request #15305 from ajacoutot/obsd-disk

disk: /etc/mtab is only used on Linux.
add fish shell completions for salt programs
Enable wheel integration tests in runtests.py
Set the route dst in the api maste_call interface
add slscolonpath

added slscolonpath because this is helpfull in formulas as a shortcut to:
```
{% set vars = salt['pillar.get'](slsdotpath.replace('.',':'), default=vars, merge=True) %}
```
Merge pull request #15313 from thatch45/runner_sreq_fix

Set the route dst in the api maste_call interface
Fix exception inside lxc