Merge branch 'MDL-55071-rebased' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Sep 2016 09:28:12 +0000 (10:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Sep 2016 09:28:12 +0000 (10:28 +0100)
commitdd460c22edc1e0ce08aea7b0b352aa8027710f4e
treea22a320192ba2a93cd3a4aae90c301454cf76c32
parent26162efe4a98dc6ab9b59effb9bf09962a1867ab
parent5142f56402bc7d5a89980adc252f4759d87c9c59
Merge branch 'MDL-55071-rebased' of git://github.com/danpoltawski/moodle