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)
commit5f30b30e8b2657ade5c727e98de286386ee002d8
tree534095e6eb32497f767c7a83618ca2d833b65f6b
parent4d2d6d18a318843e76a3a3ecb50446770ac9f788
parenta7c29df3b9bf8f3c3b23fec0f1d2feb814cb61fe
Merge branch 'master' of /home/git/platal
templates/core/password_prompt.tpl