Merge branch 'mdl-26299' of git://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 17:23:56 +0000 (18:23 +0100)
commit69c53045ba7131306f3cfba9cc8194fec37d0873
treec87cb52cee44cd405ec04c53cc2ddfc7250c318c
parent396dca7cb92927cbf7954adb8776cd850aad80cf
parent7038944105887f79c56b58a31c465808cff36014
Merge branch 'mdl-26299' of git://github.com/mackensen/moodle