Merge "(bug 39680) Convert valign to CSS vertical-align"

author Krinkle <ttijhof@wikimedia.org>

Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)
author Krinkle <ttijhof@wikimedia.org>
Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)
diff --cc includes/Skin.php
Simple merge
diff --cc includes/specials/SpecialUndelete.php
Simple merge
author	Krinkle <ttijhof@wikimedia.org>
	Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 28 Aug 2012 20:58:41 +0000 (20:58 +0000)
		1	2
includes/Skin.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/specials/SpecialUndelete.php	patch \|	diff1 \|	diff2 \|	blob \| history