Merge branch 'MDL-26369' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 23:58:01 +0000 (00:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 23:58:01 +0000 (00:58 +0100)
commit46388c9cf97e9e67f705dd08369cd547307d8516
treea7e03a4ecc078ab8669b608f48e05f1f4ecd9233
parentfe1776b9f2de943d856cb48b69bb7d33d0a95edc
parent2e5ce83f115efb4ab088e92f1fef7b7992cd530f
Merge branch 'MDL-26369' of git://github.com/timhunt/moodle