Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 08:20:10 +0000 (08:20 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 08:20:10 +0000 (08:20 +0000)
commitf20abd87590e3cabf890257c62ce520bf244fdd5
tree884ca889190c5f46ccf747af578214b6f8525f57
parent8f4662a80721dec612ebfcbf451212c1cf4dae77
parent27635149d5b217de72b107a574f78ea7b79b6f41
Merge branch 'MDL-52304_master' of https://github.com/dmonllao/moodle