Merge branch 'mdl36506-master' of git://github.com/tlock/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Mar 2015 02:31:44 +0000 (10:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Mar 2015 02:31:44 +0000 (10:31 +0800)
commit06cf88f8c46599029dc86a4f643bf715fbd8e767
treef5ccc8c6048e464bafed91ea6602e9fdb482f277
parent20d38830aed94d822079092a45ddfdd9274ed317
parent2a3e6f87da1e1ad879f3bdd15b5485273b2083c9
Merge branch 'mdl36506-master' of git://github.com/tlock/moodle