Merge branch 'MDL-28939' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 17:34:31 +0000 (19:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Aug 2011 17:34:31 +0000 (19:34 +0200)
commitc97cc5c72fdc9a6a811d9195251ae0e5616f1129
tree348c93f2ec8c455e1e4da5f41ecaedaad356d880
parent08f532865927c3b6c5324fe2e3485d80430405b7
parent9d555b445689bd830bc9a43066e3e969a3069a20
Merge branch 'MDL-28939' of git://github.com/timhunt/moodle