Merge branch 'MDL-49021_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 17:02:24 +0000 (17:02 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 17:02:24 +0000 (17:02 +0000)
commit1be8237d414caaef1fd56f1a3e05ca51f3a4f5a0
treed8fd063d256bb3d7bbea5501c6159ebec76e351a
parent6f838471f9ef02d05fe69a1056b9c5baf01b3349
parent7481f4229a5260bb66810019647f70057fe28706
Merge branch 'MDL-49021_master' of git://github.com/markn86/moodle