Merge branch 'wip-MDL-49742-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 May 2015 02:16:49 +0000 (10:16 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 May 2015 02:16:49 +0000 (10:16 +0800)
commit7ab171fdff6a580529c0671570b6a4bbc238ebd4
tree4389231289731a22f0d9c24e13033733d0cc6fb2
parentb5dbb126f9b859b43bff3f73738e3fb739671508
parent1fc2bb35e68127f0fc8a660e10de87771cf59717
Merge branch 'wip-MDL-49742-master' of git://github.com/abgreeve/moodle