[Pkg-owncloud-commits] [owncloud] 122/205: update license headers and authors

David Prévot taffit at moszumanska.debian.org
Thu Jul 2 17:37:03 UTC 2015


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit f63915d0c8b28ed507f0db6e11ef50e9a0bd39f4
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Thu Jun 25 11:43:55 2015 +0200

    update license headers and authors
---
 apps/encryption/appinfo/application.php            |  3 ++-
 apps/encryption/appinfo/register_command.php       | 22 +++++++++++++----
 apps/encryption/appinfo/routes.php                 |  2 ++
 apps/encryption/command/migratekeys.php            | 22 +++++++++++++----
 apps/encryption/controller/recoverycontroller.php  |  2 ++
 apps/encryption/controller/settingscontroller.php  |  2 ++
 apps/encryption/controller/statuscontroller.php    |  2 ++
 apps/encryption/hooks/contracts/ihook.php          |  2 ++
 apps/encryption/lib/crypto/crypt.php               |  2 ++
 apps/encryption/lib/crypto/encryption.php          |  5 +++-
 apps/encryption/lib/hookmanager.php                |  2 ++
 apps/encryption/lib/migration.php                  | 25 ++++++++++---------
 apps/encryption/lib/recovery.php                   |  2 ++
 apps/encryption/lib/session.php                    |  2 ++
 apps/encryption/lib/users/setup.php                |  2 ++
 apps/encryption/lib/util.php                       |  2 ++
 .../tests/controller/RecoveryControllerTest.php    | 16 ++++++++++++-
 .../tests/controller/SettingsControllerTest.php    |  2 ++
 apps/encryption/tests/hooks/UserHooksTest.php      | 17 ++++++++++++-
 apps/encryption/tests/lib/HookManagerTest.php      |  3 +++
 apps/encryption/tests/lib/KeyManagerTest.php       |  2 ++
 apps/encryption/tests/lib/MigrationTest.php        | 28 +++++++++++-----------
 apps/encryption/tests/lib/RecoveryTest.php         |  4 ++++
 apps/encryption/tests/lib/UtilTest.php             |  3 +++
 apps/encryption/tests/lib/crypto/cryptTest.php     |  2 ++
 .../encryption/tests/lib/crypto/encryptionTest.php |  3 +++
 apps/encryption/tests/lib/users/SetupTest.php      |  2 ++
 apps/files/ajax/delete.php                         |  2 --
 apps/files/ajax/getstoragestats.php                |  1 -
 apps/files/ajax/move.php                           |  1 -
 apps/files/ajax/newfile.php                        |  1 -
 apps/files/ajax/newfolder.php                      |  1 -
 apps/files/ajax/rename.php                         |  1 +
 apps/files/ajax/upload.php                         |  1 -
 apps/files/appinfo/app.php                         |  1 -
 apps/files/appinfo/routes.php                      |  1 +
 apps/files/download.php                            |  1 +
 apps/files/index.php                               |  1 -
 apps/files/tests/activitytest.php                  | 23 ++++++++++++++----
 apps/files/tests/controller/apicontrollertest.php  |  1 +
 apps/files/tests/service/tagservice.php            |  1 -
 apps/files_external/ajax/applicable.php            |  1 -
 apps/files_external/ajax/dropbox.php               |  1 -
 apps/files_external/appinfo/app.php                |  1 -
 apps/files_external/appinfo/routes.php             |  1 +
 apps/files_external/lib/google.php                 |  1 +
 apps/files_external/lib/sftp_key.php               |  1 +
 apps/files_external/lib/smb_oc.php                 |  1 -
 apps/files_external/list.php                       |  1 -
 apps/files_external/personal.php                   |  1 +
 .../service/globalstoragesservice.php              |  2 ++
 apps/files_external/service/storagesservice.php    |  2 ++
 apps/files_external/settings.php                   |  1 +
 apps/files_external/tests/backends/sftp.php        |  1 +
 apps/files_external/tests/config.php               |  1 -
 apps/files_sharing/ajax/shareinfo.php              |  1 +
 apps/files_sharing/api/local.php                   |  1 -
 apps/files_sharing/appinfo/app.php                 |  2 --
 apps/files_sharing/appinfo/application.php         | 22 +++++++++++++----
 apps/files_sharing/appinfo/routes.php              |  2 ++
 apps/files_sharing/appinfo/update.php              |  1 -
 .../lib/controllers/externalsharescontroller.php   |  1 +
 apps/files_sharing/lib/hooks.php                   |  1 +
 apps/files_sharing/lib/mountprovider.php           | 22 +++++++++++++----
 .../lib/propagation/changewatcher.php              | 22 +++++++++++++----
 .../lib/propagation/propagationmanager.php         | 22 +++++++++++++----
 .../lib/propagation/recipientpropagator.php        | 22 +++++++++++++----
 apps/files_sharing/lib/sharedstorage.php           |  1 +
 apps/files_sharing/list.php                        |  1 -
 apps/files_sharing/publicwebdav.php                |  3 +--
 apps/files_sharing/settings-personal.php           |  1 +
 .../tests/controller/sharecontroller.php           |  1 +
 .../tests/deleteorphanedsharesjobtest.php          |  1 -
 apps/files_sharing/tests/etagpropagation.php       |  2 ++
 .../tests/middleware/sharingcheckmiddleware.php    |  1 +
 apps/files_sharing/tests/permissions.php           |  1 +
 apps/files_sharing/tests/sharedmount.php           |  1 +
 apps/files_sharing/tests/sizepropagation.php       |  3 ++-
 apps/files_sharing/tests/unsharechildren.php       |  2 +-
 apps/files_sharing/tests/updater.php               |  1 -
 apps/files_sharing/tests/watcher.php               |  1 +
 apps/files_trashbin/ajax/delete.php                |  1 -
 apps/files_trashbin/ajax/list.php                  |  1 -
 apps/files_trashbin/ajax/preview.php               |  1 -
 apps/files_trashbin/ajax/undelete.php              |  1 -
 apps/files_trashbin/appinfo/routes.php             |  1 +
 apps/files_trashbin/appinfo/update.php             |  1 -
 apps/files_trashbin/command/expire.php             |  3 +++
 apps/files_trashbin/lib/helper.php                 |  1 -
 apps/files_trashbin/lib/trashbin.php               |  2 +-
 apps/files_trashbin/list.php                       |  1 -
 apps/files_trashbin/tests/trashbin.php             |  1 +
 apps/files_versions/ajax/preview.php               |  1 -
 apps/files_versions/ajax/rollbackVersion.php       |  1 -
 apps/files_versions/appinfo/app.php                |  1 -
 apps/files_versions/appinfo/routes.php             |  1 +
 apps/files_versions/appinfo/update.php             |  1 -
 apps/files_versions/command/expire.php             | 23 ++++++++++++++----
 apps/files_versions/download.php                   |  1 +
 apps/files_versions/lib/storage.php                |  1 +
 apps/files_versions/tests/versions.php             |  2 ++
 apps/provisioning_api/appinfo/app.php              |  1 -
 apps/provisioning_api/appinfo/routes.php           |  1 +
 apps/provisioning_api/lib/apps.php                 |  1 +
 apps/provisioning_api/lib/groups.php               |  1 +
 apps/provisioning_api/lib/users.php                |  3 +++
 apps/provisioning_api/tests/appstest.php           |  1 +
 apps/provisioning_api/tests/groupstest.php         |  1 +
 apps/provisioning_api/tests/userstest.php          |  3 +++
 apps/user_ldap/ajax/getNewServerConfigPrefix.php   |  1 -
 apps/user_ldap/appinfo/install.php                 |  1 -
 apps/user_ldap/lib/connection.php                  |  1 -
 apps/user_ldap/lib/proxy.php                       |  1 -
 apps/user_ldap/lib/user/manager.php                |  1 +
 apps/user_ldap/settings.php                        |  1 -
 apps/user_ldap/tests/user_ldap.php                 |  1 +
 apps/user_webdavauth/appinfo/app.php               |  1 +
 apps/user_webdavauth/user_webdavauth.php           |  2 +-
 console.php                                        |  3 ++-
 core/ajax/preview.php                              |  1 -
 core/ajax/share.php                                |  3 ++-
 core/ajax/update.php                               |  1 +
 core/application.php                               |  1 +
 core/avatar/avatarcontroller.php                   |  2 ++
 core/command/app/checkcode.php                     |  1 +
 core/command/check.php                             | 22 ++++++++++++++++-
 core/command/maintenance/install.php               |  2 ++
 core/command/status.php                            |  1 +
 core/command/upgrade.php                           |  1 +
 core/command/user/add.php                          |  2 ++
 core/command/user/delete.php                       |  2 ++
 core/command/user/lastseen.php                     |  1 +
 core/command/user/report.php                       |  1 +
 core/command/user/resetpassword.php                |  3 +++
 core/register_command.php                          |  1 +
 core/routes.php                                    |  1 -
 core/strings.php                                   |  1 -
 lib/base.php                                       |  2 +-
 lib/private/activitymanager.php                    |  1 -
 lib/private/api.php                                |  1 +
 lib/private/app/appmanager.php                     |  2 ++
 lib/private/app/codechecker.php                    |  1 +
 lib/private/app/platformrepository.php             |  1 -
 lib/private/appconfig.php                          |  1 +
 lib/private/appframework/app.php                   |  1 +
 lib/private/appframework/http/request.php          |  1 +
 .../utility/controllermethodreflector.php          |  2 +-
 .../appframework/utility/simplecontainer.php       |  1 +
 lib/private/apphelper.php                          |  1 +
 lib/private/avatar.php                             |  2 +-
 lib/private/avatarmanager.php                      |  2 ++
 lib/private/cache/file.php                         | 10 +-------
 .../connector/sabre/copyetagheaderplugin.php       | 21 ++++++++++++----
 .../connector/sabre/custompropertiesbackend.php    |  2 ++
 lib/private/connector/sabre/directory.php          |  1 +
 lib/private/connector/sabre/file.php               |  3 ---
 lib/private/connector/sabre/filesplugin.php        |  2 ++
 lib/private/connector/sabre/maintenanceplugin.php  |  1 +
 lib/private/connector/sabre/tagsplugin.php         |  1 -
 lib/private/console/application.php                | 21 +++++++++++++++-
 lib/private/db/migrator.php                        |  1 +
 lib/private/db/ocsqliteplatform.php                | 22 +++++++++++++----
 lib/private/encryption/hookmanager.php             |  2 ++
 lib/private/encryption/keys/storage.php            |  2 ++
 lib/private/encryption/manager.php                 |  3 +++
 lib/private/encryption/update.php                  |  2 ++
 lib/private/encryption/util.php                    |  3 +++
 lib/private/files.php                              |  5 ++--
 lib/private/files/cache/cache.php                  |  1 +
 lib/private/files/filesystem.php                   |  3 +--
 lib/private/files/mapper.php                       |  1 -
 lib/private/files/objectstore/noopscanner.php      |  1 +
 lib/private/files/storage/dav.php                  |  1 -
 lib/private/files/storage/local.php                |  1 +
 lib/private/files/storage/localtempfiletrait.php   |  2 ++
 lib/private/files/storage/mappedlocal.php          |  1 +
 lib/private/files/storage/storage.php              |  1 +
 lib/private/files/storage/storagefactory.php       |  1 -
 lib/private/files/storage/wrapper/encryption.php   |  3 +++
 lib/private/files/stream/encryption.php            |  4 +++-
 lib/private/group/manager.php                      |  3 +++
 lib/private/group/metadata.php                     |  1 +
 lib/private/helper.php                             |  2 +-
 lib/private/hooks/emittertrait.php                 |  1 -
 lib/private/l10n/string.php                        |  1 +
 lib/private/legacy/appconfig.php                   |  1 +
 lib/private/lock/memcachelockingprovider.php       |  2 ++
 lib/private/lock/nooplockingprovider.php           |  2 ++
 lib/private/log.php                                |  1 -
 lib/private/log/errorhandler.php                   |  1 +
 lib/private/log/owncloud.php                       |  7 ------
 lib/private/log/syslog.php                         |  1 -
 lib/private/memcache/arraycache.php                |  1 +
 lib/private/memcache/factory.php                   |  2 ++
 lib/private/memcache/nullcache.php                 |  3 +++
 lib/private/memcache/redis.php                     |  2 ++
 lib/private/mimetypes.list.php                     |  2 ++
 lib/private/ocsclient.php                          |  2 +-
 lib/private/preview.php                            |  3 +--
 lib/private/preview/bitmap.php                     |  2 +-
 lib/private/preview/bmp.php                        |  3 ++-
 lib/private/preview/gif.php                        |  3 ++-
 lib/private/preview/image.php                      |  2 +-
 lib/private/preview/jpeg.php                       |  3 ++-
 lib/private/preview/markdown.php                   |  1 -
 lib/private/preview/movie.php                      |  2 +-
 lib/private/preview/mp3.php                        |  2 +-
 lib/private/preview/msoffice2003.php               |  1 -
 lib/private/preview/msoffice2007.php               |  1 -
 lib/private/preview/msofficedoc.php                |  1 -
 lib/private/preview/office.php                     |  1 +
 lib/private/preview/opendocument.php               |  1 -
 lib/private/preview/png.php                        |  3 ++-
 lib/private/preview/provider.php                   |  2 ++
 lib/private/preview/staroffice.php                 |  1 -
 lib/private/preview/svg.php                        |  2 +-
 lib/private/preview/txt.php                        |  2 --
 lib/private/preview/xbitmap.php                    |  3 ++-
 lib/private/previewmanager.php                     |  1 +
 lib/private/repair.php                             |  1 +
 lib/private/repairstep.php                         |  1 -
 lib/private/response.php                           |  1 +
 lib/private/route/route.php                        |  1 +
 lib/private/server.php                             |  1 +
 lib/private/servernotavailableexception.php        |  2 +-
 lib/private/setup.php                              |  1 -
 lib/private/setup/abstractdatabase.php             |  1 -
 lib/private/setup/mysql.php                        |  1 -
 lib/private/setup/oci.php                          |  1 -
 lib/private/setup/postgresql.php                   |  1 -
 lib/private/setup/sqlite.php                       |  1 -
 lib/private/share/helper.php                       |  1 +
 lib/private/share/mailnotifications.php            |  2 +-
 lib/private/template/resourcenotfoundexception.php |  1 +
 lib/private/templatelayout.php                     |  1 +
 lib/private/tempmanager.php                        |  3 ++-
 lib/private/updater.php                            |  1 +
 lib/private/user.php                               |  1 +
 lib/private/user/database.php                      |  1 +
 lib/private/user/nouserexception.php               | 21 ++++++++++++----
 lib/private/util.php                               |  2 +-
 lib/public/api.php                                 |  1 +
 lib/public/app/iappmanager.php                     |  1 +
 .../appframework/http/datadisplayresponse.php      |  1 +
 lib/public/appframework/http/icallbackresponse.php |  1 +
 lib/public/appframework/http/ioutput.php           |  1 +
 lib/public/appframework/http/notfoundresponse.php  |  1 +
 lib/public/appframework/http/streamresponse.php    |  1 +
 lib/public/appframework/iapi.php                   |  1 -
 lib/public/command/ibus.php                        |  1 +
 lib/public/command/icommand.php                    |  1 +
 .../exceptions/genericencryptionexception.php      |  3 +++
 lib/public/encryption/iencryptionmodule.php        |  3 +++
 lib/public/encryption/ifile.php                    |  1 +
 lib/public/encryption/imanager.php                 |  3 +++
 lib/public/encryption/keys/istorage.php            |  2 ++
 lib/public/files/filenametoolongexception.php      |  1 +
 .../files/invalidcharacterinpathexception.php      |  1 +
 lib/public/files/reservedwordexception.php         |  1 +
 lib/public/files/storage.php                       |  1 -
 lib/public/http/client/iclient.php                 |  1 +
 lib/public/http/client/iclientservice.php          |  1 +
 lib/public/http/client/iresponse.php               |  1 +
 lib/public/icertificatemanager.php                 |  1 +
 lib/public/igroupmanager.php                       |  2 ++
 lib/public/ihelper.php                             |  1 +
 lib/public/iimage.php                              |  2 ++
 lib/public/imemcache.php                           |  1 +
 lib/public/iservercontainer.php                    |  1 +
 lib/public/itags.php                               |  3 ---
 lib/public/lock/ilockingprovider.php               |  1 +
 lib/public/lock/lockedexception.php                |  2 ++
 lib/public/mail/imailer.php                        |  1 +
 lib/public/preview/iprovider.php                   |  1 +
 lib/public/response.php                            |  2 ++
 lib/public/share.php                               |  1 +
 lib/public/template.php                            |  1 -
 lib/public/user.php                                |  1 -
 lib/repair/preview.php                             |  1 -
 lib/repair/repairlegacystorages.php                |  1 +
 lib/repair/repairmimetypes.php                     |  2 ++
 lib/repair/sqliteautoincrement.php                 | 22 +++++++++++++----
 ocs/routes.php                                     |  1 +
 ocs/v1.php                                         |  1 +
 public.php                                         |  1 +
 remote.php                                         |  1 -
 settings/admin.php                                 |  2 ++
 settings/ajax/enableapp.php                        |  1 -
 settings/ajax/navigationdetect.php                 |  1 -
 settings/ajax/togglegroups.php                     |  1 -
 settings/ajax/togglesubadmins.php                  |  1 -
 settings/ajax/updateapp.php                        |  1 -
 settings/application.php                           |  3 +++
 settings/changepassword/controller.php             |  2 +-
 settings/controller/checksetupcontroller.php       |  2 ++
 settings/controller/groupscontroller.php           |  1 +
 settings/controller/logsettingscontroller.php      |  1 +
 settings/controller/userscontroller.php            |  1 +
 settings/personal.php                              |  1 +
 settings/routes.php                                |  2 --
 settings/users.php                                 |  1 +
 version.php                                        |  1 -
 302 files changed, 629 insertions(+), 227 deletions(-)

diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index cb9c33c..d480439 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -2,8 +2,9 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
index 8a9df8e..f727fdf 100644
--- a/apps/encryption/appinfo/register_command.php
+++ b/apps/encryption/appinfo/register_command.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Thomas Müller <deepdiver at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 use OCA\Encryption\Command\MigrateKeys;
diff --git a/apps/encryption/appinfo/routes.php b/apps/encryption/appinfo/routes.php
index 8fa163d..a73cc57 100644
--- a/apps/encryption/appinfo/routes.php
+++ b/apps/encryption/appinfo/routes.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/command/migratekeys.php b/apps/encryption/command/migratekeys.php
index b814d69..e6e5e7b 100644
--- a/apps/encryption/command/migratekeys.php
+++ b/apps/encryption/command/migratekeys.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Thomas Müller <thomas.mueller at tmit.eu>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Encryption\Command;
diff --git a/apps/encryption/controller/recoverycontroller.php b/apps/encryption/controller/recoverycontroller.php
index f1a2651..a92c49f 100644
--- a/apps/encryption/controller/recoverycontroller.php
+++ b/apps/encryption/controller/recoverycontroller.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 7fa3f46..641c97e 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/controller/statuscontroller.php b/apps/encryption/controller/statuscontroller.php
index cdc4b2e..f330f72 100644
--- a/apps/encryption/controller/statuscontroller.php
+++ b/apps/encryption/controller/statuscontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/hooks/contracts/ihook.php b/apps/encryption/hooks/contracts/ihook.php
index d4f2070..53217f8 100644
--- a/apps/encryption/hooks/contracts/ihook.php
+++ b/apps/encryption/hooks/contracts/ihook.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index 65af3a9..f3cf38f 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index fe1d955..1fa0581 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -2,8 +2,11 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/hookmanager.php b/apps/encryption/lib/hookmanager.php
index 4b885cd..0fea1b0 100644
--- a/apps/encryption/lib/hookmanager.php
+++ b/apps/encryption/lib/hookmanager.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index 3acf77e..98fc5be 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -1,23 +1,22 @@
 <?php
 /**
- * ownCloud
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
- * @copyright (C) 2015 ownCloud, Inc.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
  *
- * @author Bjoern Schiessle <schiessle at owncloud.com>
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index 61a659e..e31a14f 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/session.php b/apps/encryption/lib/session.php
index 9709518..c3759c3 100644
--- a/apps/encryption/lib/session.php
+++ b/apps/encryption/lib/session.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index fd8261c..f224826 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -3,6 +3,8 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php
index afed96a..fbedc5d 100644
--- a/apps/encryption/lib/util.php
+++ b/apps/encryption/lib/util.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/controller/RecoveryControllerTest.php b/apps/encryption/tests/controller/RecoveryControllerTest.php
index 89b541e..d122b99 100644
--- a/apps/encryption/tests/controller/RecoveryControllerTest.php
+++ b/apps/encryption/tests/controller/RecoveryControllerTest.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * @author Clark Tomlinson  <clark at owncloud.com>
+ * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 
diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php
index 478bf82..ed8135b 100644
--- a/apps/encryption/tests/controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/controller/SettingsControllerTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php
index b0cc9cc..921c924 100644
--- a/apps/encryption/tests/hooks/UserHooksTest.php
+++ b/apps/encryption/tests/hooks/UserHooksTest.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * @author Clark Tomlinson  <clark at owncloud.com>
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 
diff --git a/apps/encryption/tests/lib/HookManagerTest.php b/apps/encryption/tests/lib/HookManagerTest.php
index fb74c05..b1d511c 100644
--- a/apps/encryption/tests/lib/HookManagerTest.php
+++ b/apps/encryption/tests/lib/HookManagerTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index eb43d5a..2561b29 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -2,6 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index c876cea..c07a453 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -1,23 +1,23 @@
 <?php
- /**
- * ownCloud
+/**
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
- * @copyright (C) 2015 ownCloud, Inc.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
  *
- * @author Bjoern Schiessle <schiessle at owncloud.com>
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php
index 0b85192..8d5d31a 100644
--- a/apps/encryption/tests/lib/RecoveryTest.php
+++ b/apps/encryption/tests/lib/RecoveryTest.php
@@ -1,6 +1,10 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php
index 18cf038..e75e8ea 100644
--- a/apps/encryption/tests/lib/UtilTest.php
+++ b/apps/encryption/tests/lib/UtilTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php
index f850725..14ed151 100644
--- a/apps/encryption/tests/lib/crypto/cryptTest.php
+++ b/apps/encryption/tests/lib/crypto/cryptTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index c6c0d57..7b0b29f 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php
index 354de26..e6936c5 100644
--- a/apps/encryption/tests/lib/users/SetupTest.php
+++ b/apps/encryption/tests/lib/users/SetupTest.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index dcd05d8..2d02869 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -1,13 +1,11 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
- * @author Björn Schießle <schiessle at owncloud.com>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index e56e425..10f8704 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -2,7 +2,6 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index ab02f99..0961636 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 6dd3e3e..be09b28 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -4,7 +4,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index b15457e..a2897dd 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -6,7 +6,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index edb6dd7..a24a57b 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index debdf26..4bc2ce8 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -9,7 +9,6 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Luke Policinski <lpolicinski at gmail.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Roman Geber <rgeber at owncloudapps.com>
  * @author TheSFReader <TheSFReader at gmail.com>
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index c483ad3..40b194a 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -3,7 +3,6 @@
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php
index 08c9041..ceeb3cd 100644
--- a/apps/files/appinfo/routes.php
+++ b/apps/files/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tobias Kaminsky <tobias at kaminsky.me>
diff --git a/apps/files/download.php b/apps/files/download.php
index c85051e..b0628e3 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Felix Moeller <mail at felixmoeller.de>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Jakob Sack <mail at jakobsack.de>
diff --git a/apps/files/index.php b/apps/files/index.php
index ee12df5..4f103f9 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -8,7 +8,6 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
- * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Roman Geber <rgeber at owncloudapps.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files/tests/activitytest.php b/apps/files/tests/activitytest.php
index 1f8d633..4ab8ad1 100644
--- a/apps/files/tests/activitytest.php
+++ b/apps/files/tests/activitytest.php
@@ -1,11 +1,24 @@
 <?php
 /**
- * Copyright (c) 2015 Joas Schilling <nickvergessen at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
-*/
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 
 namespace OCA\Files\Tests;
 
diff --git a/apps/files/tests/controller/apicontrollertest.php b/apps/files/tests/controller/apicontrollertest.php
index 0ec38e0..35d00af 100644
--- a/apps/files/tests/controller/apicontrollertest.php
+++ b/apps/files/tests/controller/apicontrollertest.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
diff --git a/apps/files/tests/service/tagservice.php b/apps/files/tests/service/tagservice.php
index 2b5d1e5..147e698 100644
--- a/apps/files/tests/service/tagservice.php
+++ b/apps/files/tests/service/tagservice.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/ajax/applicable.php b/apps/files_external/ajax/applicable.php
index b41f2e0..1b93cc3 100644
--- a/apps/files_external/ajax/applicable.php
+++ b/apps/files_external/ajax/applicable.php
@@ -2,7 +2,6 @@
 /**
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index 495387b..55dc417 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -3,7 +3,6 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Volkan Gezer <volkangezer at gmail.com>
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index cc64e29..66897eb 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -6,7 +6,6 @@
  * @author j-ed <juergen at eisfair.org>
  * @author Martin Mattel <martin.mattel at diemattels.at>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer at gmx.at>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 8c6dff7..97eb135 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Ross Nicoll <jrn at jrn.me.uk>
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 541113f..8199d97 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -5,6 +5,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer at gmx.at>
diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php
index d9bcadb..1bcea6b 100644
--- a/apps/files_external/lib/sftp_key.php
+++ b/apps/files_external/lib/sftp_key.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Ross Nicoll <jrn at jrn.me.uk>
  *
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
index 9fd3aa3..52b73c4 100644
--- a/apps/files_external/lib/smb_oc.php
+++ b/apps/files_external/lib/smb_oc.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/apps/files_external/list.php b/apps/files_external/list.php
index c97c0d8..b98db79 100644
--- a/apps/files_external/list.php
+++ b/apps/files_external/list.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index b2ab324..1ac0f65 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/globalstoragesservice.php b/apps/files_external/service/globalstoragesservice.php
index 7df0f73..0444512 100644
--- a/apps/files_external/service/globalstoragesservice.php
+++ b/apps/files_external/service/globalstoragesservice.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 51eb4ab..930f994 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index daf205d..6db6871 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -6,6 +6,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_external/tests/backends/sftp.php b/apps/files_external/tests/backends/sftp.php
index 29461c3..da2c0ac 100644
--- a/apps/files_external/tests/backends/sftp.php
+++ b/apps/files_external/tests/backends/sftp.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php
index 9907353..19dad21 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -3,7 +3,6 @@
  * @author Christian Berendt <berendt at b1-systems.de>
  * @author hkjolhede <hkjolhede at gmail.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Ross Nicoll <jrn at jrn.me.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index b2f8826..3ea0fae 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index 0381280..5b94524 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
- * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c54038f..f72f502 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -2,10 +2,8 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Gadzy <dev at gadzy.fr>
- * @author j-ed <juergen at eisfair.org>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 0eb2094..b9c2844 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Appinfo;
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 78fa138..2686abe 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -2,9 +2,11 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Georg Ehrke <georg at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index f19c9ee..e98b60e 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index da0951d..494a544 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index c3588ec..7dd04f2 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index c5d3643..3f59fd1 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing;
diff --git a/apps/files_sharing/lib/propagation/changewatcher.php b/apps/files_sharing/lib/propagation/changewatcher.php
index 483f436..05784d2 100644
--- a/apps/files_sharing/lib/propagation/changewatcher.php
+++ b/apps/files_sharing/lib/propagation/changewatcher.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/propagation/propagationmanager.php b/apps/files_sharing/lib/propagation/propagationmanager.php
index fa073be..29415fd 100644
--- a/apps/files_sharing/lib/propagation/propagationmanager.php
+++ b/apps/files_sharing/lib/propagation/propagationmanager.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index 5b7651f..26379d7 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Sharing\Propagation;
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index bf61dda..5095766 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -7,6 +7,7 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author scambra <sergio at entrecables.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index da640fd..2577ed9 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index b70274e..c75f9d1 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * @author Björn Schießle <schiessle at owncloud.com>
- * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index fdf641e..9ff94eb 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 8a075ee..0b56aaf 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Cloutier <vincent1cloutier at gmail.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
index 8b5afcb..124cb83 100644
--- a/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
+++ b/apps/files_sharing/tests/deleteorphanedsharesjobtest.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/etagpropagation.php b/apps/files_sharing/tests/etagpropagation.php
index 60b7c52..a8095f7 100644
--- a/apps/files_sharing/tests/etagpropagation.php
+++ b/apps/files_sharing/tests/etagpropagation.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index c52036e..0db8a1e 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 91f0347..c10333d 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -3,6 +3,7 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index ff4cb4c..8c61511 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -5,6 +5,7 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/sizepropagation.php b/apps/files_sharing/tests/sizepropagation.php
index 4ab3475..dbaa316 100644
--- a/apps/files_sharing/tests/sizepropagation.php
+++ b/apps/files_sharing/tests/sizepropagation.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Vincent Petry <pvince81 at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/unsharechildren.php b/apps/files_sharing/tests/unsharechildren.php
index b49180f..0cf551c 100644
--- a/apps/files_sharing/tests/unsharechildren.php
+++ b/apps/files_sharing/tests/unsharechildren.php
@@ -3,7 +3,7 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 294388b..7b4d745 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index 4af5de6..488792d 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 944e353..abec320 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index a777bdc..46168f7 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index af86daf..f17ae48 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index e7d8562..417232f 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
index 526ad1d..99a03d6 100644
--- a/apps/files_trashbin/appinfo/routes.php
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index 94bd353..e1a0cf9 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/command/expire.php b/apps/files_trashbin/command/expire.php
index e7dd5c5..89b949b 100644
--- a/apps/files_trashbin/command/expire.php
+++ b/apps/files_trashbin/command/expire.php
@@ -1,7 +1,10 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 320ad2e..42412d5 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index b30ea7c..668a3c5 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -5,13 +5,13 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Florin Peter <github at florin-peter.de>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Qingping Hou <dave2008713 at gmail.com>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Sjors van der Pluijm <sjors at desjors.nl>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
index 68602ef..890f03a 100644
--- a/apps/files_trashbin/list.php
+++ b/apps/files_trashbin/list.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 5535b33..299c45b 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index fab46ab..8ad0fe5 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 3f4d78a..e75df28 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -4,7 +4,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Sam Tuke <mail at samtuke.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 0705371..3bad0d8 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Frank Karlitschek <frank at owncloud.org>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 0ea37d3..5dbed1f 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 6fa0fd6..524f9bd 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/command/expire.php
index ec9aa3e..4492497 100644
--- a/apps/files_versions/command/expire.php
+++ b/apps/files_versions/command/expire.php
@@ -1,9 +1,24 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OCA\Files_Versions\Command;
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 3cc324c..22a218f 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 296cebf..e0034f6 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -5,6 +5,7 @@
  * @author Felix Moeller <mail at felixmoeller.de>
  * @author Florin Peter <github at florin-peter.de>
  * @author Georg Ehrke <georg at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 0b6bfc6..7cca409 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -4,7 +4,9 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/appinfo/app.php b/apps/provisioning_api/appinfo/app.php
index 33dfda9..bb5c541 100644
--- a/apps/provisioning_api/appinfo/app.php
+++ b/apps/provisioning_api/appinfo/app.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/appinfo/routes.php b/apps/provisioning_api/appinfo/routes.php
index 87f073f..323c8d6 100644
--- a/apps/provisioning_api/appinfo/routes.php
+++ b/apps/provisioning_api/appinfo/routes.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index 2bafd06..2271386 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index cd15611..c1e492f 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
  *
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index b709e09..27fc576 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tom Needham <tom at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/provisioning_api/tests/appstest.php b/apps/provisioning_api/tests/appstest.php
index 94bff8b..c4298f0 100644
--- a/apps/provisioning_api/tests/appstest.php
+++ b/apps/provisioning_api/tests/appstest.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index cb677d9..b8b0279 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php
index 0ba7635..f286256 100644
--- a/apps/provisioning_api/tests/userstest.php
+++ b/apps/provisioning_api/tests/userstest.php
@@ -2,7 +2,10 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tom Needham <tom at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/ajax/getNewServerConfigPrefix.php b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
index 897e4a9..41a061e 100644
--- a/apps/user_ldap/ajax/getNewServerConfigPrefix.php
+++ b/apps/user_ldap/ajax/getNewServerConfigPrefix.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
- * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index bc43466..0b3f84b 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -2,7 +2,6 @@
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 0328259..2bb2e1f 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -9,7 +9,6 @@
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index 347ea9c..ef01213 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
- * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php
index c8c8937..2f5ee3a 100644
--- a/apps/user_ldap/lib/user/manager.php
+++ b/apps/user_ldap/lib/user/manager.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index d17361c..fb54276 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
- * @author ben-denham <bend at catalyst.net.nz>
  * @author Dominik Schmidt <dev at dominik-schmidt.de>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Lukas Reschke <lukas at owncloud.com>
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index 2f15a5a..2b99e1c 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -2,6 +2,7 @@
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index d27e804..3f76f80 100644
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -4,6 +4,7 @@
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author j-ed <juergen at eisfair.org>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index be61cce..d670e0f 100644
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -3,7 +3,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Felix Moeller <mail at felixmoeller.de>
  * @author Frank Karlitschek <frank at owncloud.org>
- * @author Georg Ehrke <georg at ownCloud.com>
+ * @author Georg Ehrke <georg at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author opensaucesystems <ashley at opensaucesystems.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/console.php b/console.php
index 781905b..3fee81c 100644
--- a/console.php
+++ b/console.php
@@ -2,9 +2,10 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Christian Kampka <christian at kampka.net>
+ * @author Jost Baron <Jost.Baron at gmx.de>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index 2c25d6f..c571439 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -3,7 +3,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/core/ajax/share.php b/core/ajax/share.php
index e78d274..eff012f 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -3,8 +3,8 @@
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Craig Morrissey <craig at owncloud.com>
  * @author dampfklon <me at dampfklon.de>
- * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
@@ -12,6 +12,7 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Ramiro Aparicio <rapariciog at gmail.com>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Thomas Tanghus <thomas at tanghus.net>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6a29b5b..2f34708 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
diff --git a/core/application.php b/core/application.php
index cca2c60..0fbb8da 100644
--- a/core/application.php
+++ b/core/application.php
@@ -4,6 +4,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index 19ea1f7..95baf23 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
  *
diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 9e55144..ecec51e 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/core/command/check.php b/core/command/check.php
index ddfe9b7..cd7f8ee 100644
--- a/core/command/check.php
+++ b/core/command/check.php
@@ -1,5 +1,25 @@
 <?php
-
+/**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 namespace OC\Core\Command;
 
 use OCP\IConfig;
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index dbc5ed7..2fea5ad 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Christian Kampka <christian at kampka.net>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/status.php b/core/command/status.php
index 737113d..a65e985 100644
--- a/core/command/status.php
+++ b/core/command/status.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index cf37614..ac0d72a 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -3,6 +3,7 @@
  * @author Andreas Fischer <bantu at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Owen Winkler <a_github at midnightcircus.com>
+ * @author Steffen Lindner <mail at steffen-lindner.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/core/command/user/add.php b/core/command/user/add.php
index c52ec4d..07060bb 100644
--- a/core/command/user/add.php
+++ b/core/command/user/add.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Laurens Post <lkpost at scept.re>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/core/command/user/delete.php b/core/command/user/delete.php
index 63b8113..e80c63b 100644
--- a/core/command/user/delete.php
+++ b/core/command/user/delete.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Jens-Christian Fischer <jens-christian.fischer at switch.ch>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php
index 92fcb1d..931165e 100644
--- a/core/command/user/lastseen.php
+++ b/core/command/user/lastseen.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 5d89c0a..7a830f6 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/core/command/user/resetpassword.php b/core/command/user/resetpassword.php
index 3e4b41c..6c5846b 100644
--- a/core/command/user/resetpassword.php
+++ b/core/command/user/resetpassword.php
@@ -2,6 +2,9 @@
 /**
  * @author Andreas Fischer <bantu at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
+ * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Laurens Post <lkpost at scept.re>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/core/register_command.php b/core/register_command.php
index 801148a..03775fd 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -4,6 +4,7 @@
  * @author Christian Kampka <christian at kampka.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/core/routes.php b/core/routes.php
index 1555439..57fa606 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -4,7 +4,6 @@
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
diff --git a/core/strings.php b/core/strings.php
index fdd3116..e892288 100644
--- a/core/strings.php
+++ b/core/strings.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/base.php b/lib/base.php
index b9f2e4a..829c2bc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -12,7 +12,7 @@
  * @author Florin Peter <github at florin-peter.de>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
+ * @author Hugo Gonzalez Labrador <hglavra at gmail.com>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index 26db0c7..7b1d5d2 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/api.php b/lib/private/api.php
index dd50162..8e483b7 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index c9d4a77..7a61cd5 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
diff --git a/lib/private/app/codechecker.php b/lib/private/app/codechecker.php
index 8c2f340..326bf8c 100644
--- a/lib/private/app/codechecker.php
+++ b/lib/private/app/codechecker.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index bebd930..fa71bd7 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 3753261..b88df10 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -3,6 +3,7 @@
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Jakob Sack <mail at jakobsack.de>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index f6c1e31..0188d22 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index 2455209..7d6a492 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php
index e013a74..63cf5ac 100644
--- a/lib/private/appframework/utility/controllermethodreflector.php
+++ b/lib/private/appframework/utility/controllermethodreflector.php
@@ -3,7 +3,7 @@
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Olivier Paroz <github at oparoz.com>
- * @author Philipp Knechtges <philipp-dev at knechtges.com>
+ * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index c7dff6f..5a69d3d 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/apphelper.php b/lib/private/apphelper.php
index c4ddc1b..9084d2b 100644
--- a/lib/private/apphelper.php
+++ b/lib/private/apphelper.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index 133ab4b..55c328b 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -3,12 +3,12 @@
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Lukas Reschke <lukas at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/avatarmanager.php b/lib/private/avatarmanager.php
index 42f711e..6b33e8d 100644
--- a/lib/private/avatarmanager.php
+++ b/lib/private/avatarmanager.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index 4742128..c033e53 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -1,16 +1,8 @@
 <?php
 /**
- * @author Arthur Schiwon <blizzz at owncloud.com>
- * @author Bart Visscher <bartv at thisnet.nl>
- * @author Björn Schießle <schiessle at owncloud.com>
- * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author Michael Gapczynski <GapczynskiM at gmail.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Robin Appelman <icewind at owncloud.com>
- * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Thomas Tanghus <thomas at tanghus.net>
- * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/connector/sabre/copyetagheaderplugin.php b/lib/private/connector/sabre/copyetagheaderplugin.php
index 9f5d746..863d4cf 100644
--- a/lib/private/connector/sabre/copyetagheaderplugin.php
+++ b/lib/private/connector/sabre/copyetagheaderplugin.php
@@ -1,12 +1,23 @@
 <?php
-
 /**
- * ownCloud
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Vincent Petry <pvince81 at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
  *
- * @author Vincent Petry
- * @copyright 2015 Vincent Petry <pvince81 at owncloud.com>
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
- * @license AGPL3
  */
 
 namespace OC\Connector\Sabre;
diff --git a/lib/private/connector/sabre/custompropertiesbackend.php b/lib/private/connector/sabre/custompropertiesbackend.php
index 14989a5..47f3490 100644
--- a/lib/private/connector/sabre/custompropertiesbackend.php
+++ b/lib/private/connector/sabre/custompropertiesbackend.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index e994110..551176e 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -4,6 +4,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 740660f..74f96e6 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -2,10 +2,7 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author chli1 <chli1 at users.noreply.github.com>
- * @author Chris Wilson <chris+github at qwirx.com>
  * @author Jakob Sack <mail at jakobsack.de>
- * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/connector/sabre/filesplugin.php b/lib/private/connector/sabre/filesplugin.php
index 09d931b..608e8cd 100644
--- a/lib/private/connector/sabre/filesplugin.php
+++ b/lib/private/connector/sabre/filesplugin.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/lib/private/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
index c4c9a53..9a59693 100644
--- a/lib/private/connector/sabre/maintenanceplugin.php
+++ b/lib/private/connector/sabre/maintenanceplugin.php
@@ -2,6 +2,7 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/lib/private/connector/sabre/tagsplugin.php b/lib/private/connector/sabre/tagsplugin.php
index 6a788b9..7756eb4 100644
--- a/lib/private/connector/sabre/tagsplugin.php
+++ b/lib/private/connector/sabre/tagsplugin.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index f2aacbf..7c70992 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -1,5 +1,24 @@
 <?php
-
+/**
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 namespace OC\Console;
 
 use OC_App;
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index fcfe5d9..6a587ed 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -5,6 +5,7 @@
  * @author Robin Appelman <icewind at owncloud.com>
  * @author tbelau666 <thomas.belau at gmx.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Victor Dubiniuk <dubiniuk at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/db/ocsqliteplatform.php b/lib/private/db/ocsqliteplatform.php
index fe39e20..543f58b 100644
--- a/lib/private/db/ocsqliteplatform.php
+++ b/lib/private/db/ocsqliteplatform.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Robin Appelman <icewind at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\DB;
diff --git a/lib/private/encryption/hookmanager.php b/lib/private/encryption/hookmanager.php
index 31ecb2f..d096b7f 100644
--- a/lib/private/encryption/hookmanager.php
+++ b/lib/private/encryption/hookmanager.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index 848d5c0..b754462 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 4841533..1e0a065 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php
index 02579fd..125946a 100644
--- a/lib/private/encryption/update.php
+++ b/lib/private/encryption/update.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index 8049924..8bff654 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files.php b/lib/private/files.php
index 5a3e102..1789996 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -1,22 +1,21 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Brice Maron <brice at bmaron.net>
  * @author dratini0 <dratini0 at gmail.com>
- * @author Fabian Henze <flyser42 at gmx.de>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author josh4trunks <joshruehlig at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author mvn23 <schopdiedwaas at gmail.com>
  * @author Nicolai Ehemann <en at enlightened.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
  * @author Thibaut GRIDEL <tgridel at free.fr>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index a82ccec..680398e 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -4,6 +4,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Florin Peter <github at florin-peter.de>
+ * @author Jens-Christian Fischer <jens-christian.fischer at switch.ch>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 4d991e5..90019b6 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -2,10 +2,9 @@
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
- * @author Björn Schießle <schiessle at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Florin Peter <github at florin-peter.de>
- * @author Georg Ehrke <georg at ownCloud.com>
+ * @author Georg Ehrke <georg at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php
index 17831d6..2c8760b 100644
--- a/lib/private/files/mapper.php
+++ b/lib/private/files/mapper.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/files/objectstore/noopscanner.php
index 3a0df13..cdcc014 100644
--- a/lib/private/files/objectstore/noopscanner.php
+++ b/lib/private/files/objectstore/noopscanner.php
@@ -3,6 +3,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 15f5135..d67e6b9 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -5,7 +5,6 @@
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Carlos Cerrillo <ccerrillo at gmail.com>
  * @author Felix Moeller <mail at felixmoeller.de>
- * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 315a8e7..53465f8 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -7,6 +7,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Klaas Freitag <freitag at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/files/storage/localtempfiletrait.php
index e7f51a1..86c8b5c 100644
--- a/lib/private/files/storage/localtempfiletrait.php
+++ b/lib/private/files/storage/localtempfiletrait.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 4b52735..9323202 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -6,6 +6,7 @@
  * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
diff --git a/lib/private/files/storage/storage.php b/lib/private/files/storage/storage.php
index bd80909..f46ac54 100644
--- a/lib/private/files/storage/storage.php
+++ b/lib/private/files/storage/storage.php
@@ -2,6 +2,7 @@
 /**
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 31b4090..62b393c 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Björn Schießle <schiessle at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 8d1f80c..58d4c43 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 22d230e..bfa4d76 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -1,8 +1,10 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
- * @author Jasper Knockaert <jasper at knockaert.nl>
+ * @author jknockaert <jasper at knockaert.nl>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index f8defe4..65ae49d 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -4,10 +4,13 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author macjohnny <estebanmarin at gmx.ch>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author voxsim <Simon Vocella>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/group/metadata.php b/lib/private/group/metadata.php
index 66eb032..6344701 100644
--- a/lib/private/group/metadata.php
+++ b/lib/private/group/metadata.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Stephan Peijnik <speijnik at anexia-it.com>
diff --git a/lib/private/helper.php b/lib/private/helper.php
index f4de5b0..4c2f1f5 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -16,7 +16,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Owen Winkler <a_github at midnightcircus.com>
  * @author Pellaeon Lin <nfsmwlin at gmail.com>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/lib/private/hooks/emittertrait.php b/lib/private/hooks/emittertrait.php
index 5d471a3..256bf46 100644
--- a/lib/private/hooks/emittertrait.php
+++ b/lib/private/hooks/emittertrait.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php
index f5d80e6..77469f8 100644
--- a/lib/private/l10n/string.php
+++ b/lib/private/l10n/string.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php
index 3bf1fbd..54e568d 100644
--- a/lib/private/legacy/appconfig.php
+++ b/lib/private/legacy/appconfig.php
@@ -5,6 +5,7 @@
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index 85b62c8..5f2b5e5 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/lock/nooplockingprovider.php b/lib/private/lock/nooplockingprovider.php
index 4f33b88..a8571f2 100644
--- a/lib/private/lock/nooplockingprovider.php
+++ b/lib/private/lock/nooplockingprovider.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/log.php b/lib/private/log.php
index 840713b..dd5cb6e 100644
--- a/lib/private/log.php
+++ b/lib/private/log.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
- * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 5e92db3..d10c44c 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -3,6 +3,7 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 0125164..01112ef 100644
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -2,18 +2,11 @@
 /**
  * @author Andreas Fischer <bantu at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
- * @author Bernhard Posselt <dev at bernhard-posselt.com>
- * @author Björn Schießle <schiessle at owncloud.com>
- * @author Felix Moeller <mail at felixmoeller.de>
- * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Owen Winkler <a_github at midnightcircus.com>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Tom Needham <tom at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/log/syslog.php b/lib/private/log/syslog.php
index 8595b70..863d1d6 100644
--- a/lib/private/log/syslog.php
+++ b/lib/private/log/syslog.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Andreas Fischer <bantu at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/private/memcache/arraycache.php b/lib/private/memcache/arraycache.php
index 8a3fdd2..33c8bea 100644
--- a/lib/private/memcache/arraycache.php
+++ b/lib/private/memcache/arraycache.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 320657a..5bb7e42 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -6,6 +6,8 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/nullcache.php b/lib/private/memcache/nullcache.php
index f971ffc..de27b03 100644
--- a/lib/private/memcache/nullcache.php
+++ b/lib/private/memcache/nullcache.php
@@ -1,7 +1,10 @@
 <?php
 /**
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/memcache/redis.php b/lib/private/memcache/redis.php
index 30619c3..2147779 100644
--- a/lib/private/memcache/redis.php
+++ b/lib/private/memcache/redis.php
@@ -2,7 +2,9 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
+ * @author Michael Telatynski <7t3chguy at gmail.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 5f222cb..1ee4e93 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -1,10 +1,12 @@
 <?php
 /**
+ * @author Aidan Amavi <github at aidanamavi.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Normal Ra <normalraw at gmail.com>
  * @author Olivier Paroz <github at oparoz.com>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Thomas Tanghus <thomas at tanghus.net>
  * @author tiezdne <oswald.84 at t-online.de>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index f10a974..2868b40 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -7,11 +7,11 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Kamil Domanski <kdomanski at kdemail.net>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Martin Mattel <martin.mattel at diemattels.at>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Sam Tuke <mail at samtuke.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview.php b/lib/private/preview.php
index f359985..cc954bc 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -7,9 +7,8 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Robin Appelman <icewind at owncloud.com>
- * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tobias Kaminsky <tobias at kaminsky.me>
  *
diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 3071c78..12ad4f0 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -2,7 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/bmp.php b/lib/private/preview/bmp.php
index 0547f05..2a24a78 100644
--- a/lib/private/preview/bmp.php
+++ b/lib/private/preview/bmp.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/gif.php b/lib/private/preview/gif.php
index e2b7c7e..08f6c41 100644
--- a/lib/private/preview/gif.php
+++ b/lib/private/preview/gif.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index dbaf5de..f9c27e6 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Olivier Paroz <owncloud at interfasys.ch>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Thomas Tanghus <thomas at tanghus.net>
  *
diff --git a/lib/private/preview/jpeg.php b/lib/private/preview/jpeg.php
index 69edd95..86e447d 100644
--- a/lib/private/preview/jpeg.php
+++ b/lib/private/preview/jpeg.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/markdown.php b/lib/private/preview/markdown.php
index f733511..f5e7469 100644
--- a/lib/private/preview/markdown.php
+++ b/lib/private/preview/markdown.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php
index 43e49bf..a687fef 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/preview/movie.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index 49667d0..25fe656 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Thomas Tanghus <thomas at tanghus.net>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/msoffice2003.php b/lib/private/preview/msoffice2003.php
index 1403000..dd00cac 100644
--- a/lib/private/preview/msoffice2003.php
+++ b/lib/private/preview/msoffice2003.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/msoffice2007.php b/lib/private/preview/msoffice2007.php
index bd53b59..8fcdabc 100644
--- a/lib/private/preview/msoffice2007.php
+++ b/lib/private/preview/msoffice2007.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/msofficedoc.php b/lib/private/preview/msofficedoc.php
index bae4101..6ce0033 100644
--- a/lib/private/preview/msofficedoc.php
+++ b/lib/private/preview/msofficedoc.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 0a61a32..f72c5de 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/opendocument.php b/lib/private/preview/opendocument.php
index ce24bb2..21df2b5 100644
--- a/lib/private/preview/opendocument.php
+++ b/lib/private/preview/opendocument.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/png.php b/lib/private/preview/png.php
index f40c1db..a675567 100644
--- a/lib/private/preview/png.php
+++ b/lib/private/preview/png.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index ed1f3a1..d9b8093 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -3,6 +3,8 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/preview/staroffice.php b/lib/private/preview/staroffice.php
index 43e2e8e..b06de79 100644
--- a/lib/private/preview/staroffice.php
+++ b/lib/private/preview/staroffice.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 92d21c0..4e3cba5 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -1,9 +1,9 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 6844386..0bba570 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -1,9 +1,7 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Nmz <nemesiz at nmz.lt>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/private/preview/xbitmap.php b/lib/private/preview/xbitmap.php
index db7b85f..8001f21 100644
--- a/lib/private/preview/xbitmap.php
+++ b/lib/private/preview/xbitmap.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * @author Olivier Paroz <owncloud at interfasys.ch>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php
index 78ae12c..e351c01 100644
--- a/lib/private/previewmanager.php
+++ b/lib/private/previewmanager.php
@@ -2,6 +2,7 @@
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/lib/private/repair.php b/lib/private/repair.php
index 4335099..75c004e 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
diff --git a/lib/private/repairstep.php b/lib/private/repairstep.php
index ef0dfa9..25cb91d 100644
--- a/lib/private/repairstep.php
+++ b/lib/private/repairstep.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/response.php b/lib/private/response.php
index 5725af2..f1a4294 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
diff --git a/lib/private/route/route.php b/lib/private/route/route.php
index b33360f..86f05b8 100644
--- a/lib/private/route/route.php
+++ b/lib/private/route/route.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author David Prévot <taffit at debian.org>
  * @author Felix Moeller <mail at felixmoeller.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/lib/private/server.php b/lib/private/server.php
index 7e233e6..6a65895 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Bernhard Reiter <ockham at raz.or.at>
diff --git a/lib/private/servernotavailableexception.php b/lib/private/servernotavailableexception.php
index 5a57917..b273f50 100644
--- a/lib/private/servernotavailableexception.php
+++ b/lib/private/servernotavailableexception.php
@@ -15,7 +15,7 @@
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 1ffe074..50bf0dc 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -10,7 +10,6 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Martin Mattel <martin.mattel at diemattels.at>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Sean Comeau <sean at ftlnetworks.ca>
  * @author Serge Martin <edb at sigluy.net>
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index cc361a6..13daf17 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 713c779..b9246a9 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Michael Göhler <somebody.here at gmx.de>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index 4e1cb7d..791dc72 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -4,7 +4,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
  *
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 082cb60..597e38f 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -4,7 +4,6 @@
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author eduardo <eduardo at vnexu.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/setup/sqlite.php b/lib/private/setup/sqlite.php
index 4a9ead3..820a89d 100644
--- a/lib/private/setup/sqlite.php
+++ b/lib/private/setup/sqlite.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 65167dd..5b69b7c 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -4,6 +4,7 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Miguel Prokop <miguel.prokop at vtu.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 7120d84..8056260 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -2,11 +2,11 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tom Needham <tom at owncloud.com>
- * @author Lukas Reschke <lukas at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/template/resourcenotfoundexception.php b/lib/private/template/resourcenotfoundexception.php
index 26655b7..22f8bce 100644
--- a/lib/private/template/resourcenotfoundexception.php
+++ b/lib/private/template/resourcenotfoundexception.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 998a683..93bf6cb 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -9,6 +9,7 @@
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Remco Brenninkmeijer <requist1 at starmail.nl>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index eeffc6b..b8cef8e 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -1,8 +1,9 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  * @author Robin Appelman <icewind at owncloud.com>
- * @author Lukas Reschke <lukas at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 00c6569..2894a82 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -8,6 +8,7 @@
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Steffen Lindner <mail at steffen-lindner.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Victor Dubiniuk <dubiniuk at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/lib/private/user.php b/lib/private/user.php
index 8083b4e..7c3cb52 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -10,6 +10,7 @@
  * @author Florian Preinstorfer <nblock at archlinux.us>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index d080bff..0de062b 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -8,6 +8,7 @@
  * @author fabian <fabian at web2.0-apps.de>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Michael Gapczynski <GapczynskiM at gmail.com>
diff --git a/lib/private/user/nouserexception.php b/lib/private/user/nouserexception.php
index 9452362..0a077d9 100644
--- a/lib/private/user/nouserexception.php
+++ b/lib/private/user/nouserexception.php
@@ -1,12 +1,23 @@
 <?php
 /**
- * ownCloud
+ * @author Jörn Friedrich Dreyer <jfd at butonic.de>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING-AGPL file.
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
- * @author Jörn Friedrich Dreyer <jfd at owncloud.com>
- * @copyright Jörn Friedrich Dreyer 2015
  */
 
 namespace OC\User;
diff --git a/lib/private/util.php b/lib/private/util.php
index 59408c0..9c78ad3 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -11,10 +11,10 @@
  * @author Christian Reiner <github at christian-reiner.info>
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author cmeh <cmeh at users.noreply.github.com>
  * @author Florin Peter <github at florin-peter.de>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author helix84 <helix84 at centrum.sk>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Joas Schilling <nickvergessen at owncloud.com>
diff --git a/lib/public/api.php b/lib/public/api.php
index 6b920b6..a99a3af 100644
--- a/lib/public/api.php
+++ b/lib/public/api.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Tom Needham <tom at owncloud.com>
  *
diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php
index 208cd70..d8f2616 100644
--- a/lib/public/app/iappmanager.php
+++ b/lib/public/app/iappmanager.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
diff --git a/lib/public/appframework/http/datadisplayresponse.php b/lib/public/appframework/http/datadisplayresponse.php
index 35272d0..31b4c83 100644
--- a/lib/public/appframework/http/datadisplayresponse.php
+++ b/lib/public/appframework/http/datadisplayresponse.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Roeland Jago Douma <roeland at famdouma.nl>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/appframework/http/icallbackresponse.php b/lib/public/appframework/http/icallbackresponse.php
index 87da73a..aa238cb 100644
--- a/lib/public/appframework/http/icallbackresponse.php
+++ b/lib/public/appframework/http/icallbackresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/ioutput.php b/lib/public/appframework/http/ioutput.php
index ad90dc1..ba4c031 100644
--- a/lib/public/appframework/http/ioutput.php
+++ b/lib/public/appframework/http/ioutput.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/notfoundresponse.php b/lib/public/appframework/http/notfoundresponse.php
index 8f59384..968df6c 100644
--- a/lib/public/appframework/http/notfoundresponse.php
+++ b/lib/public/appframework/http/notfoundresponse.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/http/streamresponse.php b/lib/public/appframework/http/streamresponse.php
index 625b3d6..b2e0df3 100644
--- a/lib/public/appframework/http/streamresponse.php
+++ b/lib/public/appframework/http/streamresponse.php
@@ -2,6 +2,7 @@
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index 2de2a36..7d1d230 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -2,7 +2,6 @@
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
- * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/lib/public/command/ibus.php b/lib/public/command/ibus.php
index b27edc0..796862f 100644
--- a/lib/public/command/ibus.php
+++ b/lib/public/command/ibus.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/command/icommand.php b/lib/public/command/icommand.php
index 6ec0757..ed152f4 100644
--- a/lib/public/command/icommand.php
+++ b/lib/public/command/icommand.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/exceptions/genericencryptionexception.php b/lib/public/encryption/exceptions/genericencryptionexception.php
index 5648e5e..c1041e8 100644
--- a/lib/public/encryption/exceptions/genericencryptionexception.php
+++ b/lib/public/encryption/exceptions/genericencryptionexception.php
@@ -1,6 +1,9 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle at owncloud.com>
  * @author Clark Tomlinson <fallen013 at gmail.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 975e577..183b322 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/ifile.php b/lib/public/encryption/ifile.php
index 8b3f0fa..0d13812 100644
--- a/lib/public/encryption/ifile.php
+++ b/lib/public/encryption/ifile.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/encryption/imanager.php b/lib/public/encryption/imanager.php
index 0b12c75..07e2925 100644
--- a/lib/public/encryption/imanager.php
+++ b/lib/public/encryption/imanager.php
@@ -1,6 +1,9 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/encryption/keys/istorage.php b/lib/public/encryption/keys/istorage.php
index 1767781..e206373 100644
--- a/lib/public/encryption/keys/istorage.php
+++ b/lib/public/encryption/keys/istorage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/filenametoolongexception.php b/lib/public/files/filenametoolongexception.php
index ccf56e1..61cb8a2 100644
--- a/lib/public/files/filenametoolongexception.php
+++ b/lib/public/files/filenametoolongexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/invalidcharacterinpathexception.php b/lib/public/files/invalidcharacterinpathexception.php
index a257123..52e20df 100644
--- a/lib/public/files/invalidcharacterinpathexception.php
+++ b/lib/public/files/invalidcharacterinpathexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/reservedwordexception.php b/lib/public/files/reservedwordexception.php
index 0fda984..fc70c60 100644
--- a/lib/public/files/reservedwordexception.php
+++ b/lib/public/files/reservedwordexception.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index a238b77..c14ca96 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
diff --git a/lib/public/http/client/iclient.php b/lib/public/http/client/iclient.php
index ab907dc..aadb9ef 100644
--- a/lib/public/http/client/iclient.php
+++ b/lib/public/http/client/iclient.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/http/client/iclientservice.php b/lib/public/http/client/iclientservice.php
index 2a8bff7..14dfcc0 100644
--- a/lib/public/http/client/iclientservice.php
+++ b/lib/public/http/client/iclientservice.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 3a717d1..0e0ef4c 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/icertificatemanager.php b/lib/public/icertificatemanager.php
index aeb18fd..b1a16d8 100644
--- a/lib/public/icertificatemanager.php
+++ b/lib/public/icertificatemanager.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
diff --git a/lib/public/igroupmanager.php b/lib/public/igroupmanager.php
index 4f41c80..862c772 100644
--- a/lib/public/igroupmanager.php
+++ b/lib/public/igroupmanager.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
diff --git a/lib/public/ihelper.php b/lib/public/ihelper.php
index 41fe3f5..45a078b 100644
--- a/lib/public/ihelper.php
+++ b/lib/public/ihelper.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/iimage.php b/lib/public/iimage.php
index c62bf36..38db14d 100644
--- a/lib/public/iimage.php
+++ b/lib/public/iimage.php
@@ -1,6 +1,8 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Olivier Paroz <github at oparoz.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/imemcache.php b/lib/public/imemcache.php
index a1a0079..01c2990 100644
--- a/lib/public/imemcache.php
+++ b/lib/public/imemcache.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 2770280..97ca7f1 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -4,6 +4,7 @@
  * @author Bernhard Posselt <dev at bernhard-posselt.com>
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 7faeb61..12dbdc1 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -1,10 +1,7 @@
 <?php
 /**
  * @author Bernhard Reiter <ockham at raz.or.at>
- * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Morris Jobke <hey at morrisjobke.de>
- * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer at scrutinizer-ci.com>
  * @author Thomas Tanghus <thomas at tanghus.net>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/lib/public/lock/ilockingprovider.php b/lib/public/lock/ilockingprovider.php
index fd2aa61..f1aa795 100644
--- a/lib/public/lock/ilockingprovider.php
+++ b/lib/public/lock/ilockingprovider.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/public/lock/lockedexception.php b/lib/public/lock/lockedexception.php
index d6cec4c..e707133 100644
--- a/lib/public/lock/lockedexception.php
+++ b/lib/public/lock/lockedexception.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/mail/imailer.php b/lib/public/mail/imailer.php
index 9580104..ac3fe9b 100644
--- a/lib/public/mail/imailer.php
+++ b/lib/public/mail/imailer.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/preview/iprovider.php b/lib/public/preview/iprovider.php
index 1a58176..821cdb3 100644
--- a/lib/public/preview/iprovider.php
+++ b/lib/public/preview/iprovider.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/response.php b/lib/public/response.php
index 42220e4..953c797 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -1,7 +1,9 @@
 <?php
 /**
+ * @author Andreas Fischer <bantu at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Frank Karlitschek <frank at owncloud.org>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/public/share.php b/lib/public/share.php
index 6c8b82f..c4f266a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -9,6 +9,7 @@
  * @author Michael Kuhn <suraia at ikkoku.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
+ * @author Roeland Jago Douma <roeland at famdouma.nl>
  * @author Sam Tuke <mail at samtuke.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/lib/public/template.php b/lib/public/template.php
index 63079c0..cc91bff 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Georg Ehrke <georg at ownCloud.com>
  * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
diff --git a/lib/public/user.php b/lib/public/user.php
index e2413e3..23f77c0 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -7,7 +7,6 @@
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lorenzo M. Catucci <lorenzo at sancho.ccd.uniroma2.it>
- * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin McCorkell <rmccorkell at karoshi.org.uk>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/lib/repair/preview.php b/lib/repair/preview.php
index 28c0ab9..2284da9 100644
--- a/lib/repair/preview.php
+++ b/lib/repair/preview.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Georg Ehrke <georg at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/repair/repairlegacystorages.php b/lib/repair/repairlegacystorages.php
index 1bc4967..5ba452c 100644
--- a/lib/repair/repairlegacystorages.php
+++ b/lib/repair/repairlegacystorages.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
diff --git a/lib/repair/repairmimetypes.php b/lib/repair/repairmimetypes.php
index fa6aa11..89ad0ed 100644
--- a/lib/repair/repairmimetypes.php
+++ b/lib/repair/repairmimetypes.php
@@ -1,8 +1,10 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Normal Ra <normalraw at gmail.com>
  * @author Olivier Paroz <github at oparoz.com>
+ * @author Victor Dubiniuk <dubiniuk at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/lib/repair/sqliteautoincrement.php b/lib/repair/sqliteautoincrement.php
index 79b1fe7..b8ae5c4 100644
--- a/lib/repair/sqliteautoincrement.php
+++ b/lib/repair/sqliteautoincrement.php
@@ -1,9 +1,23 @@
 <?php
 /**
- * Copyright (c) 2015 Vincent Petry <pvince81 at owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Vincent Petry <pvince81 at owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
  */
 
 namespace OC\Repair;
diff --git a/ocs/routes.php b/ocs/routes.php
index 751a16d..f8e6f33 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tom Needham <tom at owncloud.com>
diff --git a/ocs/v1.php b/ocs/v1.php
index 8002ca6..2829cf0 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -4,6 +4,7 @@
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Tom Needham <tom at owncloud.com>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/public.php b/public.php
index f390166..858e8af 100644
--- a/public.php
+++ b/public.php
@@ -7,6 +7,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/remote.php b/remote.php
index 4db887a..c1077e4 100644
--- a/remote.php
+++ b/remote.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jörn Friedrich Dreyer <jfd at butonic.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  * @author Vincent Petry <pvince81 at owncloud.com>
diff --git a/settings/admin.php b/settings/admin.php
index ee252ce..533b615 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -2,11 +2,13 @@
 /**
  * @author Arthur Schiwon <blizzz at owncloud.com>
  * @author Bart Visscher <bartv at thisnet.nl>
+ * @author Björn Schießle <schiessle at owncloud.com>
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
  * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Martin Mattel <martin.mattel at diemattels.at>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index b63bce7..69b186b 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -4,7 +4,6 @@
  * @author Christopher Schäpers <kondou at ts.unde.re>
  * @author Kamil Domanski <kdomanski at kdemail.net>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
index 16c7e20..d7c1cbc 100644
--- a/settings/ajax/navigationdetect.php
+++ b/settings/ajax/navigationdetect.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f85505b..87b60e4 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -5,7 +5,6 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 632768a..767baa9 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv at thisnet.nl>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 4541b80..5fc8829 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -4,7 +4,6 @@
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
diff --git a/settings/application.php b/settings/application.php
index 920d172..03203b4 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -1,8 +1,11 @@
 <?php
 /**
+ * @author Björn Schießle <schiessle at owncloud.com>
  * @author Georg Ehrke <georg at owncloud.com>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 69b7ca7..12499ad 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -2,10 +2,10 @@
 /**
  * @author Björn Schießle <schiessle at owncloud.com>
  * @author Christopher Schäpers <kondou at ts.unde.re>
+ * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author cmeh <cmeh at users.noreply.github.com>
  * @author Florin Peter <github at florin-peter.de>
  * @author Jakob Sack <mail at jakobsack.de>
- * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
  * @author Sam Tuke <mail at samtuke.com>
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 3ced5af..0b4c72a 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -1,6 +1,8 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
+ * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/groupscontroller.php b/settings/controller/groupscontroller.php
index 6cb0cd3..218a9c0 100644
--- a/settings/controller/groupscontroller.php
+++ b/settings/controller/groupscontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  *
diff --git a/settings/controller/logsettingscontroller.php b/settings/controller/logsettingscontroller.php
index f3de1fb..cae0d41 100644
--- a/settings/controller/logsettingscontroller.php
+++ b/settings/controller/logsettingscontroller.php
@@ -2,6 +2,7 @@
 /**
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
+ * @author Thomas Müller <thomas.mueller at tmit.eu>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index d0b5267..d9b6ba7 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @author Clark Tomlinson <fallen013 at gmail.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/settings/personal.php b/settings/personal.php
index 7bf1110..f4409e6 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -8,6 +8,7 @@
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
  * @author Jan-Christoph Borchardt <hey at jancborchardt.net>
+ * @author Lukas Reschke <lukas at owncloud.com>
  * @author Marvin Thomas Rabe <mrabe at marvinrabe.de>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/settings/routes.php b/settings/routes.php
index 52b320c..10c3117 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -9,9 +9,7 @@
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Raghu Nayyar <me at iraghu.com>
- * @author Robin Appelman <icewind at owncloud.com>
  * @author Thomas Müller <thomas.mueller at tmit.eu>
- * @author Vincent Petry <pvince81 at owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/settings/users.php b/settings/users.php
index c438e5f..3d7f39a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -7,6 +7,7 @@
  * @author Daniel Molkentin <daniel at molkentin.de>
  * @author Georg Ehrke <georg at owncloud.com>
  * @author Jakob Sack <mail at jakobsack.de>
+ * @author Joas Schilling <nickvergessen at owncloud.com>
  * @author Lukas Reschke <lukas at owncloud.com>
  * @author Morris Jobke <hey at morrisjobke.de>
  * @author Robin Appelman <icewind at owncloud.com>
diff --git a/version.php b/version.php
index 8a61c49..1564f45 100644
--- a/version.php
+++ b/version.php
@@ -2,7 +2,6 @@
 /**
  * @author Frank Karlitschek <frank at owncloud.org>
  * @author Lukas Reschke <lukas at owncloud.com>
- * @author Morris Jobke <hey at morrisjobke.de>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list