Merge branch 'wip-MDL-50881-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:03:23 +0000 (12:03 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:03:23 +0000 (12:03 +0800)
commit34e0377fc68f6c41e8a52f866da510de815c1722
tree5ed5d72b858b94811e4fe188af1d24b2c7441a21
parent889a0c840a396fd499af122c96525ef53506d106
parent10c82ca3077c71371e192696b4ee74e93859038d
Merge branch 'wip-MDL-50881-master' of git://github.com/marinaglancy/moodle