Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Oct 2015 06:05:02 +0000 (14:05 +0800)
commit66116cf5c4737c539e600875041289fbcef084ca
tree2623e16d38b42f480042ab84d52bb45324716596
parent99690e0fa836f1a247c515ce72b9839f019afb07
parent317938393c737b25cc620805d7d049992ff82fbb
Merge branch 'MDL-49682-master' of git://github.com/andrewnicols/moodle