Merge branch 'w43_MDL-42206_m26_metaedit' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:27:11 +0000 (23:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2013 21:27:11 +0000 (23:27 +0200)

Trivial merge