Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 May 2016 03:04:38 +0000 (11:04 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:11 +0000 (17:16 +0800)
commit96fd37749e9d7c82c2c8ba3529d6efe422b4776f
tree94a13a60c1ad169a73858cb5d18b9d6661deb40e
parent7ae90fe03ce9850ceeda180bcba4119cb1634a2f
parent0be8dbd9b26abb0a5cb9d7ba7fac387bb639a0a2
Merge branch 'MDL-52599-master' of git://github.com/danpoltawski/moodle