Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 23 Dec 2015 02:04:51 +0000 (10:04 +0800)
commit2ece61e65245b81d868de1e7a292b82621f63aa1
treec684bf260e8c8f57b2452e2bbfb0505146b624ae
parent3dc5cdf543b460f1e46af2a85745bdbead5d7915
parentdb9be61f20d8f90ebb19acc0f996eb6a318e6258
Merge branch 'MDL-52355-master' of git://github.com/junpataleta/moodle