Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:42:53 +0000 (13:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:42:53 +0000 (13:42 +0100)
commit5fceb11e6c9025b374949b8b75c0cbd142bdbab8
tree7347bc288d3833d3fff24ccf135cd328e900daac
parenta1333dd3a3de867c4e094842aa769083396a96d2
parentcef7621e3075ee51ae44f46554f60ff3c2adc353
Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle