Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:25:58 +0000 (01:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Feb 2013 00:25:58 +0000 (01:25 +0100)

Trivial merge