Merge branch 'wip-MDL-51095-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:06:47 +0000 (12:06 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 17 Aug 2015 04:06:47 +0000 (12:06 +0800)
commitc05c91d0d4a8e9b94ca8c54529a88d56ab98a205
tree9db247f3dee71dec93a5cdd31e50cb6b1d276588
parent34e0377fc68f6c41e8a52f866da510de815c1722
parent1165cab2b338561abe3d53cd780f05c1bfc1fe21
Merge branch 'wip-MDL-51095-master' of git://github.com/marinaglancy/moodle