Merge "(bug 24437) Add nofollow to image link"

author Catrope <roan.kattouw@gmail.com>

Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)
author Catrope <roan.kattouw@gmail.com>
Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)
diff --cc includes/Linker.php
Simple merge
diff --cc tests/parser/parserTests.txt
Simple merge
author	Catrope <roan.kattouw@gmail.com>
	Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 15 Aug 2012 01:37:24 +0000 (01:37 +0000)
		1	2
includes/Linker.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/parser/parserTests.txt	patch \|	diff1 \|	diff2 \|	blob \| history