Merge "Fix regression in API log events (bug 35635)"

author Catrope <roan.kattouw@gmail.com>

Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)
author Catrope <roan.kattouw@gmail.com>
Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/api/ApiQueryLogEvents.php
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 24 Jul 2012 23:18:41 +0000 (23:18 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiQueryLogEvents.php	patch \|	diff1 \|	diff2 \|	blob \| history