Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)
commit8921c6c0c24b0261203846db51d4971048e98d5b
tree49f2345f34867cfe2092112d3e31e85d05a52981
parent039d204abd7e2eb3fb03302ae422737bb6aa1e47
parent2471088111f4fc6e85fcd9a61e5d4c935e2d83fd
Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle