Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 07:18:50 +0000 (15:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 07:18:50 +0000 (15:18 +0800)
commit6236442aad5ea122375cd56408871beb89b06966
treefda97b29d39b99369e1a9de91f2e42063af0b6bd
parentc3c2fc538ae7673e44fe283f427f6ff179a59ae4
parentf0ce225c128c186d9a6a941cc251f911b57f2afc
Merge branch 'wip-MDL-36938-m25' of git://github.com/samhemelryk/moodle