Merge branch 'MDL-47657-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:52:40 +0000 (10:52 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:52:40 +0000 (10:52 +0100)
commit62b5979cb1741a3f0c4cb395ec38ca773ee8c009
tree40d12d61053e7e4e9c75b9db2c7df4e76c65a3c8
parent42da111dbeef45e42cc51629c6471a0744ac579e
parentd0d59df9398b56561d23c335d8227ba3fc5b46e5
Merge branch 'MDL-47657-master' of git://github.com/gurgus/moodle