Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 16:12:18 +0000 (18:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 16:12:18 +0000 (18:12 +0200)
commit9cdff2b2a5d555e8084cdbb3b55196d36aacfc72
treea0048b0e924a688c99c528aa54fb216191c61a8a
parentae5b0cde4d3762f8ff677bdef96f14e110482f3a
parent7bbf41661b949cda6edce48a2f78ad7077e3f976
Merge branch 'wip-MDL-27988-master' of git://github.com/samhemelryk/moodle