[owncloud: 28/28] Merge branch 'master' into f19 (update F19 to 7.0.4)

[Adam Williamson]

commit abcc70325b4b3a6cae723b5cbcc2f33a8a75361c
Merge: 7eb944e b729706
Author: Adam Williamson <awilliam at redhat.com>
Date:   Sat Dec 27 13:22:15 2014 -0800

    Merge branch 'master' into f19 (update F19 to 7.0.4)
    
    This brings F19 into line with all other branches except EPEL 6,
    with ownCloud 7.0.4, as a pre-EOL bump.

 .gitignore                                        |    6 +-
 0001-dropbox-use-Composer-autoloader.patch        |   43 +++
 owncloud-4.5.13-no_swf.patch                      |    6 -
 owncloud-6.0.0-fix-autoloader.patch               |   16 -
 owncloud-6.0.0-pimple-include.patch               |   11 -
 owncloud-6.0.0a-apps_3rdparty_includes.patch      |  334 ---------------------
 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.2-10927.patch                        |   25 ++
 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-7.0.3-3rdparty_includes.patch            |  168 +++++++++++
 owncloud-7.0.3-opcache_invalidate.patch           |  131 ++++++++
 owncloud-7.0.4-google1.patch                      |  234 ++++++++++++++
 owncloud-README.fedora                            |   11 +-
 owncloud-mysql.txt                                |    5 +-
 owncloud-nginx.conf                               |    9 +-
 owncloud-postgresql.txt                           |   16 +-
 owncloud.spec                                     |  290 ++++++++++++------
 sources                                           |    2 +-
 24 files changed, 955 insertions(+), 576 deletions(-)
---