Merge branch 'MDL-45762-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Jun 2016 01:54:49 +0000 (09:54 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:16 +0000 (09:04 +0100)
commitd91b6854e98b273f98d13bd7586e7546eddc96d8
tree5b935a3348220765bf81ee822e8168d38557cbfb
parenta029e5212da07a661a410a0b42399c22311d2c5b
parent8e61e0f9b9ce8b1526ad82e7ea85d6bcb8a50913
Merge branch 'MDL-45762-master' of https://github.com/xow/moodle