Merge branch 'MDL-52059' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 14:48:27 +0000 (14:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Nov 2015 14:48:27 +0000 (14:48 +0000)
commit6ae9762b3743abb8ea81dabf8b84ae3adf8a34e0
treeb83b1916a21bff3cef872cd03b83a4f805ce9b1f
parent8e4c398b5237a2b802f6cae2d6910d63e89c874a
parentc31f23186e3618203a6a312510b89f7d73f253ed
Merge branch 'MDL-52059' of git://github.com/stronk7/moodle