Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 28 Apr 2016 13:29:39 +0000 (14:29 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:18:05 +0000 (12:18 +0100)
commitf6ab2b87e69c9da59bd65e1e3fb913302d7e2b82
treeb9804030909dd4152ed29440583a77003bc2acdc
parent89ef883129658b28471b77df03cd73a7ab0eeb4a
parent8ea0f17ae9c92600bddc3fcecc67b33f933e779e
Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle