Merge remote branch 'upstream/master'
authorOlivier Migeot <olivier@migeot.org>
Tue, 4 Oct 2011 09:45:57 +0000 (11:45 +0200)
committerOlivier Migeot <olivier@migeot.org>
Tue, 4 Oct 2011 09:45:57 +0000 (11:45 +0200)
1  2 
view/fr/strings.php

Simple merge