Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)
commit88f50b3551dcd316f30c5713b36bab58e8f993bd
treeafd8d6b177ca161698875d77365efccb6b4f0897
parent8ffdb1309ce1d0e6054950b55bf446a47b1aaecb
parent79d4558a5811aa426b7a85eb493dec10dc982a6a
Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle