Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 17:38:48 +0000 (19:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 28 Mar 2011 17:38:48 +0000 (19:38 +0200)

Trivial merge