Merge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 05:53:08 +0000 (13:53 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 12 Nov 2013 05:53:08 +0000 (13:53 +0800)
commitb8a598ad6591ded8c436430e5a5d43fb75969f72
treeaa30e1c7c7c558eaa542433f5a54dec1029f1861
parent0ac5863d862e5b00d65ee22ec95c0f9de9e1218b
parentb63f542d21cc14c0f81e8745d92702ba106d7a2e
Merge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle