Merge branch 'MDL-46894' of git://github.com/timhunt/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 08:52:21 +0000 (16:52 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 25 Aug 2014 08:52:21 +0000 (16:52 +0800)
commit91f31c097dd46674d8535096e020ffa42536e854
tree19bdf23c88e6b00bf2b110a7f43366b936f53251
parentb7e662bb1327c221ff3faa27ce378f927f2df1e4
parentef03842ad3f8c89811a8b108b3a537eb7c636382
Merge branch 'MDL-46894' of git://github.com/timhunt/moodle