Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 May 2016 06:27:06 +0000 (14:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:07 +0000 (17:16 +0800)
commita8c2cb02cadbf9561bd048b88c2e69c6a4b323a0
treedbf507a82a6f08aaa2323df07f02b317c9f5711d
parent98c2893cdd14b053077614a7166f3e1e874f5bbd
parentc7e44175339e105184d10a89929529b60a3b4fb2
Merge branch 'MDL-54566_master' of git://github.com/markn86/moodle