Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Sep 2014 09:16:15 +0000 (17:16 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Sep 2014 09:16:15 +0000 (17:16 +0800)
commit0e88fe02274f15b8ca8bfc1470a56b82f553d0d0
tree14217adb33fd508c1e061ab7eb04767c7d8b0ec7
parentde62e57a9b8a535d661bd93a3c800bc5f83d5d30
parent38b8d3e7f1107c5d8ead53ecaebdaacf4344e505
Merge branch 'MDL-47012-m' of git://github.com/micaherne/moodle