Merge remote branch 'mike/master'
authorolivierm <olivier@migeot.org>
Tue, 8 Mar 2011 13:39:26 +0000 (14:39 +0100)
committerolivierm <olivier@migeot.org>
Tue, 8 Mar 2011 13:39:26 +0000 (14:39 +0100)
commit25c674b73a5ec39a9826906aed3e35e77d72e392
treedc17e0d8f5dc899ccfa9e0239fe7623c43a95d49
parent07ebc15612807512422ba84060914c5c4c853102
parentc248b28f922603ec135fea903a9ec3f0ef63c935
Merge remote branch 'mike/master'
view/fr/strings.php