Merge branch 'MDL-52427' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 13:27:38 +0000 (13:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 13:27:38 +0000 (13:27 +0000)
commit2c10892c9e171b2c7843be2db630d256eefd1a4e
tree12f86ce918586dac50c299f974f72a6bc8bd8a8b
parent77d0aaa5e3d1e43d7e9bb3facdaaac16d3aadec0
parentd392b13a6325a0cfe1d15110c0ecbed1710a171f
Merge branch 'MDL-52427' of git://github.com/timhunt/moodle