Merge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 25 May 2015 08:37:06 +0000 (16:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 25 May 2015 08:37:06 +0000 (16:37 +0800)
commitd34a865a6177ed6fc78f33b7c695d1948f38633c
tree8833fd33766984f8748b6c35dc149e66d68ecb6d
parent803f565753bd9fe41acc802774adac75c2219880
parentc2c5f874e1f03ec96ba52ad54c9d269b8ee311a8
Merge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle