Merge commit 'refs/merge-requests/31' of git://gitorious.org/owncloud/owncloud into...

author Robin Appelman <icewind1991@gmail.com>

Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)

committer Robin Appelman <icewind1991@gmail.com>

Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)
author Robin Appelman <icewind1991@gmail.com>
Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)
committer Robin Appelman <icewind1991@gmail.com>
Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)
diff --cc inc/lib_base.php

index 2e207735361a566c73a988778e5ad1b6bc7072cc,d0b25834421a227f88d22b238dad53acffd3e88d..aae9048f09b8e30ac7d635e05d89125798170b8c

mode 100644,100755..100644
--- 1/inc/lib_base.php
--- 2/inc/lib_base.php
+++ b/inc/lib_base.php
diff --cc inc/lib_user.php

index 5fbde168ace0d467e18ae9763937aec08921e934,1d0cb86c6a79dd4b65b5b12cb6bde9bd801ebc6a..1d0cb86c6a79dd4b65b5b12cb6bde9bd801ebc6a

mode 100644,100755..100644
--- 1/inc/lib_user.php
--- 2/inc/lib_user.php
+++ b/inc/lib_user.php
author	Robin Appelman <icewind1991@gmail.com>
	Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)
committer	Robin Appelman <icewind1991@gmail.com>
	Tue, 27 Jul 2010 22:16:56 +0000 (00:16 +0200)
		1	2
inc/lib_base.php	patch \|	diff1 \|	diff2 \|	blob \| history
inc/lib_user.php	patch \|	diff1 \|	diff2 \|	blob \| history