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)
commit66f1870701de720c3b42b5764d7096b01aea0728
treeb98b1ea012303aaa9404a468d61b762fd3addd9a
parent58b9cd031f46b661b113c4ecd01468ed82c8dfb1
parentd2f3c5c58dba549581aa3acf4d29e7a74f06f798
Merge branch 'w12_MDL-38180_m25_enrolpics' of git://github.com/skodak/moodle