Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 02:26:51 +0000 (10:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 02:26:51 +0000 (10:26 +0800)
commit80e31fdeaa033c8e7df6b24002b85a30ccf9bfd8
tree19719e07c915bcfd33247f0802374b0157748df2
parent35d5053ba20432059b497d85e39175d356f44fb4
parent43b0df2601bd658ed20b0f551a89e0d4e36eee98
Merge branch 'MDL-55668-master' of git://github.com/danpoltawski/moodle