Merge branch 'MDL-54072' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:14:27 +0000 (15:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:14:27 +0000 (15:14 +0800)
commitcc47c7174bc74cbeeb9d02b634769b4b5f063216
treedb34988538309a79bcc5d24a4019f49965924645
parent3ff8d3024694dec86c309ba6e8043d58c0a055ae
parent4ec4b2b65ce67000db28ad6c6677f1af4afdb4d1
Merge branch 'MDL-54072' of git://github.com/aolley/moodle