Merge branch 'MDL-27401-master' of git://github.com/sammarshallou/moodle
commit36da95632280260eaaecac1b417098f2c7a50b08
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 15:46:22 +0000 (9 17:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 May 2011 15:46:22 +0000 (9 17:46 +0200)
treec4e4318c879745452934e7f4042f4ba60d5867ca
parent439ae873af90df98d1418d7261b7cc81a620fad9
parent0367953eafda8a56b3090fa83d22a6ae08c46030
Merge branch 'MDL-27401-master' of git://github.com/sammarshallou/moodle