Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 03:18:58 +0000 (11:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Aug 2016 03:18:58 +0000 (11:18 +0800)
commitbc1ac4a89dd15705c9cc90db1f25896d257d18eb
tree4e9898234ac361feef8499a6d3dc2e0eb6a9be35
parentaf1cacb586bb1691dba428e2157280d160c9733c
parent92c9be1978f625a2b8a68f87b75806fd486dd95d
Merge branch 'wip-MDL-55708-master' of git://github.com/marinaglancy/moodle