Merge remote-tracking branch 'upstream/master'

author Sarah Hoffmann <lonvia@denofr.de>

Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)

committer Sarah Hoffmann <lonvia@denofr.de>

Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)
author Sarah Hoffmann <lonvia@denofr.de>
Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)
committer Sarah Hoffmann <lonvia@denofr.de>
Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)
diff --cc lib/log.php
Simple merge
diff --cc sql/functions.sql
Simple merge
diff --cc utils/setup.php
Simple merge
author	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)
committer	Sarah Hoffmann <lonvia@denofr.de>
	Wed, 23 Apr 2014 19:46:08 +0000 (21:46 +0200)
		1	2
lib/log.php	patch \|	diff1 \|	diff2 \|	blob \| history
sql/functions.sql	patch \|	diff1 \|	diff2 \|	blob \| history
utils/setup.php	patch \|	diff1 \|	diff2 \|	blob \| history