Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 14 Oct 2014 10:34:14 +0000 (18:34 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 14 Oct 2014 10:34:14 +0000 (18:34 +0800)
commitacab649e068812808392c43a8043baf6d5ab0830
tree5d5bde935e334353f49b1d6d2ecdb2764155aa01
parentf50395b4027245d24caf64afe891a98b5c96fb8d
parentda45dc0497845a622848e834e1139439111be732
Merge branch 'MDL-47189-master-2nd' of git://github.com/FMCorz/moodle