Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 05:32:27 +0000 (15:32 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 11 Jun 2013 05:32:27 +0000 (15:32 +1000)
commit849a0161283fcf4313b308b66a07a01a432ea113
treed654cc3eaf2c4abc7458bcca8114e6121e3771e1
parent11ea436f4fe598e746f1e198e36d1600a85504f2
parent19127f6f0984049ea6a77fdc7614d16adb12d4f6
Merge branch 'MDL-37459-master-fix' of https://github.com/damyon/moodle