Merge branch 'wip-MDL-45390-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
commitb4311689f6e861bf63a6010e9f58651a58f6ef4a
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:12:51 +0000 (18 14:12 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:12:51 +0000 (18 14:12 +0800)
treee60bde3792351a530f62af30077c02d18d21dd9f
parentb627d8c15bce6fa15164a7a627d0ecc3d7bf66aa
parentb215dec368407674aa8f25000596ee637e98210a
Merge branch 'wip-MDL-45390-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE