Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle
authorMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)
committerMarina Glancy <marina@moodle.com>
Fri, 7 Nov 2014 03:54:13 +0000 (11:54 +0800)
commit2f1d0ea6639d8b66fcc4bebb2c712671fe3f2330
treec847cd45cd499568dcf72e5bc0dcc2daacd3c33f
parent419d1abdadce06bf37377fea8a3a8f2e94e7c49a
parent274962a1e7ebd25b18637654b597e9c61a0af3ed
Merge branch 'MDL-46986-master' of git://github.com/lameze/moodle