Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 03:56:16 +0000 (11:56 +0800)
commitdc30770656919399cb674a9bac6d0e52db66b40a
tree40be7d8ea99ec9527b3a531a957312191adb8687
parent2d5032db89b3fbbedeb8b673c6337f377a32514d
parentf418d899576049673f4504285427d3790da4c0e4
Merge branch 'MDL-54128_masterv2' of https://github.com/snake/moodle