Merge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 May 2016 08:15:03 +0000 (16:15 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 May 2016 09:16:08 +0000 (17:16 +0800)
commitdf88d9a72e16e0193bc9782c3831929b169c337c
treed624764f1c9539415a9b43f342ce1b2b4b683188
parent52ccda9607820481f67678e721ad20dedaae5fd0
parent388a8dbc4f16608d5c8c806a97b1bfd91423a1b9
Merge branch 'MDL-54584-master' of git://github.com/andrewnicols/moodle