Merge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 Nov 2015 08:46:34 +0000 (08:46 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 12 Nov 2015 08:46:34 +0000 (08:46 +0000)
commit5318521b1774175843854f19feae9360a834e8d0
treee018c2ff168a959d3a94ba3843af246d35ccc2a3
parent9e9754b7aab9a104f690395b5c7ef160bd87df3d
parentb6ceafab52b6bf07753cdadea7a7c6b4b9a9e86b
Merge branch 'wip-MDL-51819-master' of git://github.com/abgreeve/moodle