Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 03:30:33 +0000 (11:30 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 15 Jun 2012 03:30:33 +0000 (11:30 +0800)
commitccd4972636fde130e2e4c59326ffddff6a9e6211
tree79ddbf5a75bb96052cbf5c1850229abdb2db1460
parentf898b935af7efcb26883b11f8f463775d0c9a2d9
parente7ae9c26000cd9fde5973319b9e4cb8ad6b54741
Merge branch 'MDL-33758-master-integration' of git://github.com/FMCorz/moodle