Merge branch 'MDL-43733' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)
commitb72aa1adcbbbd4dd371067a09633bafba6e90960
treeab0ff5cb5fbbce022d691284d8ff3440a5f0bb59
parente6fbca9f65aa4449509b66bb08bd404d79a1c5e3
parent3d96b4945aa99f14f3db5f816ab527555f19ed42
Merge branch 'MDL-43733' of git://github.com/timhunt/moodle