Merge branch 'MDL-50720' of git://github.com/bostelm/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:27:09 +0000 (08:27 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:27:09 +0000 (08:27 +0800)
commitfb41850a3c6dca89783c1786f6ab3a144248066d
tree82eb5af929b5ff6531958a65195ac66340431414
parentede96605ac49ffd5b5d1ef8ebac08fea9921532b
parent0bec64c6a1339a826d36015ee020bde230746a4e
Merge branch 'MDL-50720' of git://github.com/bostelm/moodle