Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)
diff --cc lib/lib.php
Simple merge
diff --cc sql/functions.sql
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Mon, 26 May 2014 20:24:54 +0000 (22:24 +0200)
		1	2
lib/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history