Merge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:29:24 +0000 (14:29 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 06:29:24 +0000 (14:29 +0800)
commite86fb5043f13c91d2267e4260bcc5eb3c2bbd5f0
tree42e736f000dc11545a9b36349f246e3e28c7e1ff
parentf53b50e628a73b0e4d6c35576bbe3302ed2c27db
parent28f8993d0f055599ac4f44c78adb2ad6a98a8f17
Merge branch 'MDL-52068-master' of git://github.com/FMCorz/moodle