Merge branch 'MDL-54613-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE
commita2ddf7d84d32af109fb38021f9baab6262d473d7
authorDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:21:11 +0000 (19 11:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 May 2016 03:21:11 +0000 (19 11:21 +0800)
tree40891d6de49d4dc2e1e47a0b675cab3191cf476b
parent54d3a2c4e49688df7d549ac8e8ac6a81e98759ab
parente7a48b1afd531dc211863cccaa537c4d639a2322
Merge branch 'MDL-54613-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE