Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:13:18 +0000 (10:13 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Aug 2015 02:13:18 +0000 (10:13 +0800)
commit09fc06d7990e0d3843a09f3c17a7a68c21029d92
tree3f257f01adf9fd2071b6cc5a7227a2a50160df4e
parent61e44f4033a55e86b0bc56bd03cf23445923505f
parent336a84339155acdc36bd1662beb746f9e59bade5
Merge branch 'wip-MDL-50973-master' of git://github.com/marinaglancy/moodle