Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2013 14:00:33 +0000 (16:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 May 2013 14:00:33 +0000 (16:00 +0200)
commit4a19404d65fe29d1c483a8f4e79de6655136f25e
treea10842e8ec829e22f055b7b43cb70c26a756cd3c
parent748524f1b665e9c3f922c586ced1cbb0ff83d976
parent06535ae415dbcfa03fde5e99536df4f698af7ca4
Merge branch 'wip-MDL-39177-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE