Merge branch 'w38_MDL-35062_m24_selfaction' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 16:57:39 +0000 (18:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 16:57:39 +0000 (18:57 +0200)

Trivial merge