From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 Apr 2014 16:50:38 +0000 (+0000)
Subject: Merge "Handle conflicting image format options in predictable way."
X-Git-Tag: 1.31.0-rc.0~16209
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=85d4e39ff096d05386fd2f333cd6acea66ad6f90;p=lhc%2Fweb%2Fwiklou.git

Merge "Handle conflicting image format options in predictable way."
---

85d4e39ff096d05386fd2f333cd6acea66ad6f90