Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:38:36 +0000 (13:38 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 12:38:36 +0000 (13:38 +0100)
commit2dbaaa9bdcf665a9bcf6cf00c50f4b808459f5f2
tree203f5261cce25c5a431f3e743a7444b0de9cf79f
parenteab9f3d32eb9860388a8ce41ba3e9e5e20d73c81
parent8178b7824db05e57323b0007c7cd5e6da4c73d1b
Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle