Merge branch 'wip-MDL-48390-m28' of git://github.com/marinaglancy/moodle into MOODLE_...
commitb2959dbe9b996eec00d79e89169b703fe56d7a67
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:49:09 +0000 (8 18:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Dec 2014 17:49:09 +0000 (8 18:49 +0100)
treeca67f363a720a32755efa2afc269094fdbd1d89f
parent5eb62533cd38bfead26e3b833890c938dd66d704
parent92b71540b3b49223c87c52c45f9c7cb1eb7244d1
Merge branch 'wip-MDL-48390-m28' of git://github.com/marinaglancy/moodle into MOODLE_28_STABLE