fix merge of Iec98e472
authordaniel <daniel.kinzler@wikimedia.de>
Fri, 5 Oct 2012 13:30:43 +0000 (15:30 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Fri, 5 Oct 2012 13:30:43 +0000 (15:30 +0200)
commit7af8c74e1a799f26ba81fc95d8f0f2dbead52bfc
tree8480626301a0c5aa5f1f614011a476399ef89861
parent0f5242d629760b0bf2fb30eeb2dac5edd874d913
fix merge of Iec98e472

Change-Id: I0db2e30ce6e80d046c223bcf3e4d2569922e172f
includes/api/ApiParse.php