Merge "Handle conflicting image format options in predictable way."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Apr 2014 16:50:38 +0000 (16:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Apr 2014 16:50:38 +0000 (16:50 +0000)
commit85d4e39ff096d05386fd2f333cd6acea66ad6f90
tree4bac7e2849759fc5c32ceb6cba1301c2f9cf1ebd
parent8079d4a7d1044f6d7b98af2fd7489f0d22ede01c
parent083ec382c4afb0b43468130bdaf1e31dcb8918cd
Merge "Handle conflicting image format options in predictable way."
includes/parser/Parser.php
tests/parser/parserTests.txt