Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:47:18 +0000 (16:47 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 16:47:18 +0000 (16:47 +0000)
commitbf47ce505032c08fd0dc7a05466df4f9bc2cccb4
treed01ce5e73b7c9dc8ca982c5a01361969b732fa95
parent43fcd55e0c81e33fb8ed9ab701d2c719a02250e9
parente83bcc1050ab250aaeaa2c31371028a74509e14d
Merge branch 'MDL-52380-master' of git://github.com/junpataleta/moodle