Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)
commit953eb35c84066ca2d161f23183ea807a457f05d0
treeb64943f4c26de373233c471238260475c63b9691
parent3e511ca50bb522366ea44541470e02b8721425e9
parent75b70ab6cdc1ecdddd09df714f26122cb736ffb3
Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle