Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle
commit56420e3664225510e5838101f3fff4f9d135f688
authorDan Poltawski <dan@moodle.com>
Wed, 1 Jul 2015 09:04:37 +0000 (1 11:04 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 1 Jul 2015 09:04:37 +0000 (1 11:04 +0200)
treed89cda5137a45834675d5abfc599fcf827f21486
parentbc7a59536b4940779159f558d0ff9d239fe14c04
parent96a2e00d42c2d978ae7a68395871b66cb71c58ad
Merge branch 'MDL-39319-master' of git://github.com/mastnym/moodle