Merge branch 'wip-MDL-52760-master' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 04:55:46 +0000 (12:55 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Mar 2016 04:55:46 +0000 (12:55 +0800)
commit0ae7fa12ac8d49faf79d89fec9d12beeb9f3b137
tree91004792033cd59b6d11b7f56cd9e0399dc1622b
parent227a4f141960fb32d7d4f21b2777c69a7e1513c0
parenteb97811beea08ec9f2ecbecf8ad0e4d9e86bf24a
Merge branch 'wip-MDL-52760-master' of https://github.com/marinaglancy/moodle