Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 03:21:22 +0000 (11:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 Sep 2015 03:21:22 +0000 (11:21 +0800)
commit785ebcdbe6d06d08ef41f83eae7be36263484c20
tree5d8dc1603dbf0c1fd4ea9b848aa1698190ed20c7
parent52eaa0ceda6f4a64d9a064602b1e6cb3e94d360e
parentd6bef7e7069c06a4da37ed4d7471e2bb45c14e5a
Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle