Merge branch 'MDL-52738' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:47:45 +0000 (14:47 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:47:45 +0000 (14:47 +0000)
commit5d5db1030f2d9336c775d218f6222b5e14f0c010
tree62d3a7ce93d45b9cfc3f6139601e05ce402e5a2e
parente34710c7feac8e0fc85b2af909912def92a5f8d8
parentc67ab86fa931df5065afa9925f2427421e9c7dfe
Merge branch 'MDL-52738' of git://github.com/timhunt/moodle