Merge branch 'master' into channels

author Thomas Müller <thomas.mueller@tmit.eu>

Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)

committer Thomas Müller <thomas.mueller@tmit.eu>

Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
author Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
committer Thomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
diff --cc lib/ocsclient.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
committer	Thomas Müller <thomas.mueller@tmit.eu>
	Mon, 30 Sep 2013 18:21:51 +0000 (20:21 +0200)
		1	2
lib/ocsclient.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history