Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 16 Oct 2013 07:45:40 +0000 (15:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 16 Oct 2013 07:45:40 +0000 (15:45 +0800)
commit22889692695f4730443fba60dab42dee17e75eff
tree777bdeb6629dd44bba7c493906c5d327a56a75b7
parentb2858b916a2f90b04ee3aaec2372606239b9e400
parent87a26cc402419516a4c4bf1ee9c0ecc4fd69fee8
Merge branch 'MDL-42065_master' of https://github.com/sam-moodle/moodle