Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 19:05:26 +0000 (21:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 19:05:26 +0000 (21:05 +0200)
commitaf1e3f282884bba5114148ea228fa9b334ca3056
treef843bd349283c0ca8c167fb155399303a4b5ce29
parent5298faed69803d7d03c5ebbf2ff2a3802d2c890f
parenteef59b125435f674b3ddc6577d223f35dc579211
Merge branch 'w35_MDL-35070_m24_selfcleanup' of git://github.com/skodak/moodle

Conflicts:
enrol/self/editenrolment.php
enrol/self/editenrolment.php
enrol/self/lang/en/enrol_self.php