Merge branch 'master' into share_api

Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js

1 files changed, 15 insertions, 0 deletions

diff --git a/lib/public/app.php b/lib/public/app.php
index 28411933beb..5689f53ffb2 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -35,6 +35,21 @@ namespace OCP;
  */
 class App {
         /**
+         * @brief Makes owncloud aware of this app
+         * @brief This call is deprecated and not necessary to use.
+         * @param $data array with all information
+         * @returns true/false
+         *
+         * @deprecated this method is deprecated
+         * Do not call it anymore
+         * It'll remain in our public API for compatibility reasons
+         *
+         */
+        public static function register( $data ){
+		return \OC_App::register( $data );
+        }
+
+        /**
          * @brief adds an entry to the navigation
          * @param $data array containing the data
          * @returns true/false