Merge branch 'w38_MDL-35063_m24_manualaction' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 15:41:49 +0000 (17:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 15:41:49 +0000 (17:41 +0200)
commit8f75ffeba1c74c0448f608fd183352ae03c6387d
treedb35063b6a899f90d71e559778908553c1c6c120
parent5ceded28695ddad647885545f936d7dcf21530b8
parent5ddd9921fe86762aab46ddaf3a4843da753e399b
Merge branch 'w38_MDL-35063_m24_manualaction' of git://github.com/skodak/moodle