Merge branch 'master' into ocs_api

author Tom Needham <tom@owncloud.com>

Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)

committer Tom Needham <tom@owncloud.com>

Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)
author Tom Needham <tom@owncloud.com>
Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)
committer Tom Needham <tom@owncloud.com>
Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)
diff --cc lib/app.php

index ccd0958cd01a45878702c75ca52c5b665483f6e9,be6d5ab3dd34f0907831944de59bef22fa23cd15..30f76300365f54cca5dd785e5925ea6b6fe30f0b

mode 100644,100755..100644
--- 1/lib/app.php
--- 2/lib/app.php
+++ b/lib/app.php
author	Tom Needham <tom@owncloud.com>
	Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)
committer	Tom Needham <tom@owncloud.com>
	Sun, 16 Dec 2012 22:29:00 +0000 (22:29 +0000)