Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)
commit6e57e7865230f8ffb436bb430ae8cce83e4c79bb
tree8ffef2f75342632b91498d9a4ba16179c58189bd
parent0cf471fbdde41f5e343de1e1eae408e5a0c197fd
parent799e001c15d96a9a7cbe8a14fed4f60a3c0a0deb
Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle