Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)
commit8ffdb1309ce1d0e6054950b55bf446a47b1aaecb
tree491bf9256716b1e307409115f9007749bc14cb44
parent58fe694167195b1592b2903d5cc78bb133e08985
parent49f3c89324d50ecb1d15969f88ee131915da09b1
Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle