Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:17:30 +0000 (17:17 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 5 May 2014 09:17:30 +0000 (17:17 +0800)
commitcbc394fabf46e8aad4eb2a2f12bf1aff486b4893
tree07d30babb5393ad3a1238bb9f51a1cbbcad0981e
parentd0144cd38ef7139d5e1d4d79eab980fdc62223fe
parent5090038929d8f6118d09a34fdfce5ba10a55a8c1
Merge branch 'MDL-43319-master' of git://github.com/danpoltawski/moodle