Merge branch 'MDL-54837-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 07:51:56 +0000 (08:51 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 07:51:56 +0000 (08:51 +0100)
commitf3caf30690de0f1d25fe77bf4e3c7d096fea088a
tree50ac5b342bc075ebaf1d74223bbf42761b3d0d55
parent8d7bd87e6e7a1cc9003f37475dc7d0f54ca6029b
parent64e9180d2e88f224b35feabfb2f62973f121338c
Merge branch 'MDL-54837-master' of git://github.com/marinaglancy/moodle