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)
commit2326b8d3018d3f2c7d0bff84485115adff30cbf3
treef8e908b3e1b60289e04bd1df36a1c55bc5970317
parent18318237d741a7326ce88419823705498135bec1
parentc102060deb7e74d8a2c2cb7409db76cd61f677c7
Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle