Merge branch 'master' of git://anongit.kde.org/owncloud

core/templates/layout.guest.php

@@ -35,6 +35,6 @@
 			</div></header>
 			<?php echo $_['content']; ?>
 		</div>
-		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'is a personal cloud which runs on your own server' ); ?>.</p></footer>
+		<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> <?php echo $l->t( 'gives you the freedom to control your own data on the internet' ); ?></p></footer>
 	</body>
 </html>

settings/apps.php

@@ -46,7 +46,9 @@ foreach($registeredApps as $app){
 	}
 }
 
-$categories=array_keys(OC_OCSClient::getCategories());
+$catagoryNames=OC_OCSClient::getCategories();
+if(is_array($catagoryNames)){
+	$categories=array_keys($catagoryNames);
 	$externalApps=OC_OCSClient::getApplications($categories);
 	foreach($externalApps as $app){
 		$apps[]=array(
@@ -57,6 +59,7 @@ foreach($externalApps as $app){
 			'author'=>$app['personid'],
 		);
 	}
+}