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

author Frank Karlitschek <frank@dev.(none)>

Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)

committer Frank Karlitschek <frank@dev.(none)>

Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)
author Frank Karlitschek <frank@dev.(none)>
Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)
committer Frank Karlitschek <frank@dev.(none)>
Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)
diff --cc inc/lib_base.php
Simple merge
diff --cc index.php
Simple merge
author	Frank Karlitschek <frank@dev.(none)>
	Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)
committer	Frank Karlitschek <frank@dev.(none)>
	Sun, 14 Mar 2010 21:01:38 +0000 (22:01 +0100)
		1	2
inc/lib_base.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history