Merge branch 'wip-MDL-51604-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 08:21:07 +0000 (16:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 15 Oct 2015 08:21:07 +0000 (16:21 +0800)
commita97cde7a6ec3fc88281764b4a2a9ebfa2937c820
tree614d5c66d0d42deeb6855a375d9b6565aaeb1dd7
parent055c5bc02a7b229d79ea218bbf6352962dd9a2d4
parent2542cb54689d76cb412f8d8621aeb810960b54bf
Merge branch 'wip-MDL-51604-master' of git://github.com/marinaglancy/moodle