Merge branch 'MDL-52791' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Jan 2016 14:26:59 +0000 (14:26 +0000)
committerDavid Monllao <davidm@moodle.com>
Fri, 29 Jan 2016 02:15:19 +0000 (10:15 +0800)
commit4ce6dac426edee2844bf082375a8c21757bbe674
tree15fd1cc9ee86dbfa33fe9a6cdca2a7092f5dc447
parent4ce63c9ccfe4f714aa0b8a8409671a8003f7e476
parentfdd629667e0723f66a87b82e8b1054c4f9d5a904
Merge branch 'MDL-52791' of git://github.com/timhunt/moodle