Merge branch 'wip-MDL-48847-m27' of git://github.com/marinaglancy/moodle into MOODLE_...
commitf4ebb7eb0a4c056a5fab796eea6298d597ef0eaa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 23:28:46 +0000 (21 00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Jan 2015 23:28:46 +0000 (21 00:28 +0100)
tree845cbca3b7c17156e6d2972dfe2a15ab42547095
parent990854c17ba124b49b1ec216ba620d1386c07fe9
parent9beca92ae69356fccb90ec0efd357795047f8424
Merge branch 'wip-MDL-48847-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE