Merge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 21:21:21 +0000 (22:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Feb 2011 21:21:21 +0000 (22:21 +0100)

Trivial merge