Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:43:59 +0000 (12:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Jan 2013 04:43:59 +0000 (12:43 +0800)
commitb1be977406c29ed5a559b4ba7df6affc9142c1ea
tree9e3b529d35febc28e8521c3cf68f511ea474467d
parentaa452f97e37175d355f300c29bebb40f19be5d08
parentc5772ede5beae93dab1a32a2340e0a78e5657697
Merge branch 'w02_MDL-29596_m25_editauth' of git://github.com/skodak/moodle