Merge branch 'MDL-52879' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:57 +0000 (10:26 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 16 Feb 2016 10:26:57 +0000 (10:26 +0000)
commitcfdc1bb0ca18cbfeaa84fb86c4c55e7efdf1d0e3
tree819e018456e0b6022c1a8695b861470a284b4fc4
parent5d8dfdef1d4276894a0e7e666f28482e45818d65
parent6d19eb4b238f315ee22dcdfc14aea0c375dc7b75
Merge branch 'MDL-52879' of git://github.com/timhunt/moodle