From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Wed, 26 Oct 2011 09:40:01 +0000 (+0200)
Subject: Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
X-Git-Tag: v2.2.0-beta~133
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=85819105a66247852c5eee9b9512907c0398edbd

Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
---

85819105a66247852c5eee9b9512907c0398edbd