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)

Trivial merge