Merge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 04:52:13 +0000 (12:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 9 Aug 2016 04:52:13 +0000 (12:52 +0800)
commit6c19db54f924f4b62037bdec247f77f2ea174229
tree3ed2c186855b27fee21309631100a3fcc1a2def9
parent19491e68fe14c575ef8c7c912b1f71f0e1e5d5bd
parent8ce58c99f090c2a9046b0c481f7abbfecc2a615b
Merge branch 'MDL-53572-master' of git://github.com/danpoltawski/moodle