Merge branch 'master' of /home/git/platal
authorOlivier Le Floch <olivier.le-floch@polytechnique.org>
Wed, 16 Jan 2008 17:13:38 +0000 (18:13 +0100)
committerOlivier Le Floch <olivier.le-floch@polytechnique.org>
Wed, 16 Jan 2008 17:13:38 +0000 (18:13 +0100)
1  2 
templates/core/password_prompt.tpl

Simple merge