]> git.mjollnir.org Git - moodle.git/commit
Resolved conflict
authornicolasconnault <nicolasconnault>
Mon, 26 Mar 2007 09:28:06 +0000 (09:28 +0000)
committernicolasconnault <nicolasconnault>
Mon, 26 Mar 2007 09:28:06 +0000 (09:28 +0000)
commit697bbb9b274460d6b07d2c7e8feb3423a56c30bd
tree4b08d989b8f2d0ab15bb4469fe4db720ca2c17ae
parent1ecd677e1c1247baa6d09231e1434613c7369a1a
Resolved conflict
user/index.php