Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 07:26:49 +0000 (15:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Feb 2015 07:26:49 +0000 (15:26 +0800)
commitfa42965c2ab121c84d13f91aafb28034f333fd42
treefd5355563e1e81a92abf540d52b1e686bfd0a554
parent0e8182e8f8463037c3010e244d2aedf531bfdeb8
parentc430c2c246d221881b5921bc147875fde4b4c979
Merge branch 'm29_MDL-48805' of git://github.com/totara/moodle