Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 May 2014 01:59:23 +0000 (13:59 +1200)
commit37fddc545c99d4e1496848fdf39a5dc138d62648
tree6f1fcaff34efcea4a14f92c3efec37b529d1e15a
parentf0085cd6ab18797c2cb5a7422f8509c986596e10
parente39099ac3667e22f171d82c8fbb456f456323334
Merge branch 'MDL-45603-master' of https://github.com/merrill-oakland/moodle