Merge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:39:58 +0000 (02:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Aug 2012 00:39:58 +0000 (02:39 +0200)

Trivial merge