Merge branch 'MDL-40412_m25' of git://github.com/merrill-oakland/moodle into MOODLE_2...
commit40aa1f4d88a75090de41a597c2028143c6a0f624
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:08:09 +0000 (15 22:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 20:08:09 +0000 (15 22:08 +0200)
treeb7196588f355ac00dc510db807925cb920b12343
parentad92b2f1ae60b8496d729ed2bd377fad923b03ef
parent74d5fbac0412c1f34066d59d5915f04169ab9ebb
Merge branch 'MDL-40412_m25' of git://github.com/merrill-oakland/moodle into MOODLE_25_STABLE