Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 4 Aug 2014 07:13:30 +0000 (15:13 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 4 Aug 2014 07:13:30 +0000 (15:13 +0800)
commitda45b022f2db0ba68d44761f68d1790b517a187a
tree16dc9dbf0e26d005dc837623103c32bc3d7af3bf
parent27dbf2628ffae058f5ca1e154d65aab912fecf63
parent5cba1029cae33464f4189b6eeede3262148c938d
Merge branch 'MDL-32917-master' of git://github.com/andrewnicols/moodle