Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:18:52 +0000 (09:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 11 Nov 2015 01:18:52 +0000 (09:18 +0800)
commit212dc418d422018d256522a38aa0184a5a4f6215
tree610b596c6a964d36c6886ae89c9ae6bf9b94f63c
parent3c6210a45243fddf969ce3d5f05579d3ffb3c3bb
parentd26d0d9b7e9b333d1c10eb62b195cdb52f0ef835
Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle