Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 12:40:15 +0000 (13:40 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 12:40:15 +0000 (13:40 +0100)
commit030806a4ba6f3ddae2fc6cb92cb97e0c378cdc5b
treeb3ab2ddcc01bd51208a0f80ffa1a64e005ad6aba
parentfcd8119eda5986917221e21c0dce76c35561a6ab
parente450eb32d907b8ef1c459a3e5affd3bcaf9264ac
Merge branch 'MDL-40179-master' of git://github.com/lameze/moodle