Merge branch 'MDL-49306-master' of git://github.com/gurgus/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 11:35:36 +0000 (12:35 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Apr 2015 11:35:36 +0000 (12:35 +0100)
commitcb5ab19e7719c7509e703030fd0cf9eafe617a86
treeabdff76b2b3911b0a888c37ca38e5f157b54d954
parent75e20c1845d3cc7d98ddaa368e63ff6effd6ce54
parentad5c323065c9fe288b211af3e7794e82d4b53b87
Merge branch 'MDL-49306-master' of git://github.com/gurgus/moodle