Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 16:58:55 +0000 (17:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 16:58:55 +0000 (17:58 +0100)

Trivial merge