Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 07:42:09 +0000 (17:42 +1000)
committerMarina Glancy <marina@moodle.com>
Mon, 5 Aug 2013 07:42:09 +0000 (17:42 +1000)
commit698be6bbd09079723e0590ce518480f533fb665b
tree78e4dcfea153c387af25459e6ddf435e2d3f5bcc
parentfd6d13bab1de20e69b1cc44e06605ab5af6c353a
parentd6277b0ca0795480da1aaa15a73dd2b59d97b566
Merge branch 'MDL-40997-master' of git://github.com/FMCorz/moodle