Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:02:00 +0000 (14:02 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:02:00 +0000 (14:02 +0800)
commitd9e7af1d6a7ff249025aee6f3f4d2fa100b91ccf
treeb7f5897c1482581308f7c91d29415279d0c575e1
parent50c338b84b41ed57645f08518d8fb092eeaea8c0
parent7d7e5a4cf0db3b74db8dd7d5ec36e2cf8d4ef1cf
Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle