Merge branch 'MDL-55325-master' of https://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:33:21 +0000 (10:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 02:33:21 +0000 (10:33 +0800)
commit72e92d0ac2db4c422bc34293c13791a055a58a67
treebfbd66546808d5a5efc9a6a727d71c4e867b8fcc
parent837cec00f9260177690aeafe42ea89d27aa8e59e
parent4c3472a55c85a83717f895a07989b1c0003345dc
Merge branch 'MDL-55325-master' of https://github.com/xow/moodle