Jared Camins-Esakov 300b1276d6 Revert "Merge branch 'bug_9025' into 3.12-master" ... This reverts commit 081e1ba4c3, reversing changes made to 7e25faace8.		2013-03-18 10:05:09 -04:00
..
en	Bug 9239 QA follow-up: fix highlighting and merge error	2013-03-16 21:32:33 -04:00
images	Bug 9587 : Mozilla Persona login	2013-02-24 10:15:35 -05:00
itemtypeimg	Revert "Merge branch 'bug_9025' into 3.12-master"	2013-03-18 10:05:09 -04:00