[owncloud/f20: 21/21] Merge branch 'master' into f20

[Adam Williamson]

commit 19c0d29076a3506bf061a0347630bf530255e4e6
Merge: 75fbc50 4ae602e
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Aug 28 23:50:52 2014 -0700

    Merge branch 'master' into f20

 .gitignore                                         |    2 +
 owncloud-6.0.0-fix-autoloader.patch                |   16 --
 owncloud-6.0.0-pimple-include.patch                |   11 --
 owncloud-6.0.0a-blowfish-include.patch             |   33 ----
 owncloud-6.0.0a-disable_irods.patch                |   18 --
 owncloud-6.0.0a-sharing_backend_log.patch          |   11 --
 owncloud-6.0.3-fix-routing-symfony-2.3.patch       |   22 ---
 owncloud-7.0.0-contact_type.patch                  |   28 ++++
 owncloud-7.0.0-opcache_invalidate.patch            |   42 +++++
 ...ch => owncloud-7.0.0rc1-3rdparty_includes.patch |   93 +-----------
 owncloud-7.0.2-autoloader_paths.patch              |   12 ++
 owncloud-7.0.2-composer_3rdparty_autoloader.patch  |   90 ++++++++++
 owncloud-7.0.2-composer_includepath.patch          |   10 ++
 owncloud-README.fedora                             |   14 +-
 owncloud-httpd.conf                                |   10 ++
 owncloud-mysql.txt                                 |   36 +++--
 owncloud-nginx.conf                                |    9 +-
 owncloud-postgresql.txt                            |   48 +++++--
 owncloud.spec                                      |  171 ++++++++++++++------
 sources                                            |    2 +-
 20 files changed, 391 insertions(+), 287 deletions(-)
---