Merge branch 'master' into share_api

Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php

7 files changed, 0 insertions, 13 deletions

diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
index cc15102bbc3..e3e92fcfa16 100644
--- a/core/ajax/grouplist.php
+++ b/core/ajax/grouplist.php
@@ -45,5 +45,3 @@ foreach( OC_Group::getGroups() as $i ){
 }
 
 OC_JSON::encodedPrint($groups);
-
-?>
diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index a6433b1964a..2bd6b7ed634 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -29,4 +29,3 @@ $app = $_POST["app"];
 $l = OC_L10N::get( $app );
 
 OC_JSON::success(array('data' => $l->getTranslations()));
-?>
diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
index c8168eaf460..85ca004ae66 100644
--- a/core/ajax/userlist.php
+++ b/core/ajax/userlist.php
@@ -44,5 +44,3 @@ foreach( OC_User::getUsers() as $i ){
 }
 
 OC_JSON::encodedPrint($users);
-
-?>
diff --git a/core/ajax/validateuser.php b/core/ajax/validateuser.php
index 258bd50fcad..78ec451fac2 100644
--- a/core/ajax/validateuser.php
+++ b/core/ajax/validateuser.php
@@ -36,5 +36,3 @@ if(!isset($_SERVER['PHP_AUTH_USER'])){
 	        OC_JSON::encodedPrint(array("username" => $_SERVER["PHP_AUTH_USER"], "user_valid" => "false"));
 	}
 }
-
-?>
diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index a58489228d8..e69f8bb726b 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -39,5 +39,3 @@ if($categories->hasCategory($category)) {
 }
 
 OC_JSON::success(array('data' => array('categories'=>$categories->categories())));
-
-?>
diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index 75def433d30..a41fa083c38 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -34,5 +34,3 @@ if(is_null($categories)) {
 $vcategories = new OC_VCategories($app);
 $vcategories->delete($categories);
 OC_JSON::success(array('data' => array('categories'=>$vcategories->categories())));
-
-?>
diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index 252b3d3454c..3e5540cbc22 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -31,5 +31,3 @@ $categories = $vcategories->categories();
 debug(print_r($categories, true));
 $tmpl->assign('categories',$categories);
 $tmpl->printpage();
-
-?>