Merge branch 'MDL-33682' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:37:42 +0000 (00:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 22:37:42 +0000 (00:37 +0200)
commit1df09d3af2230dc6532718c7ea17ed25605ebccf
treea1b63c6a95144d3a1153b1e43cd4de96182933ec
parentdbe4bcc959d0a4cdea29554ce0f5647f148aa238
parentff5d6f88722f5a01fd6c2423d24eb1e3201e0f8c
Merge branch 'MDL-33682' of git://github.com/timhunt/moodle