bring back external mount doc
Merge pull request #312 from RandolfCarter/stable6_fix_win_php_version_hint

Correct PHP installation hints
Conflicts:
	admin_manual/installation/installation_windows.rst
Updated Contacts Doc
requires commit?
Removing question comments
Merge pull request #423 from owncloud/contacts.rst-changes

Updated Contacts Doc
Remove try_files that was causing issues

This 'try_files' was probably originally put in as a security measure against maliciously uploaded static objects that would be then executed as php. See here https://nealpoole.com/blog/2011/04/setting-up-php-fastcgi-and-nginx-dont-trust-the-tutorials-check-your-configuration/

This is not needed because 'fastcgi_split_path_info' line already guarantees only the intended php file is passed to PHP as the SCRIPT_FILENAME.
update oc7 document image
Merge pull request #429 from owncloud/oc7-doc-image

update oc7 document image
Merge pull request #410 from owncloud/bring-back-external

bring back external mount doc
fix jenkins errors
Merge pull request #427 from josh4trunks/master

Remove try_files that was causing issues
Recommend GMP extension for SFTP due to SSH Diffie-Hellman Key Agreement.
Merge pull request #431 from owncloud/recommend-gmp-for-sftp

Recommend GMP extension for SFTP
Merge pull request #430 from owncloud/fix-jenkins

fix jenkins build errors
calendar changes

Work in progress
Modifications to calendar.rst file.

Note to reviewers:  I don't see the "export button" or a way of opening
the "import dialog".  Please review that section carefully and provide
input.
Added *.snag files to .gitignore