Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 9 Oct 2014 11:16:43 +0000 (12:16 +0100)
commit68cf8d118ecad0d5b821f911a5f956bfa68912c0
tree485d967bb57dc661ba09fe949bde38ce041c175c
parent15ba6a0ded7348b9c33f863ff958f23852d1e11d
parentfef943738d59bf9784b606f8aa4c255ff1d6aaba
Merge branch 'MDL-46481-master-fixup' of https://github.com/FMCorz/moodle