Merge branch 'MDL-28108' of git://github.com/timhunt/moodle
commitf684dce0139afcc553257b5958ada15acbace14d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:00:12 +0000 (30 00:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Jun 2011 22:00:12 +0000 (30 00:00 +0200)
tree74a6bab24cb738508602e17956074bfa9c9c257a
parent6e344148c1b744ffc46d3335f16bfe40972383be
parent05a5c2f9a2ff9cd8f62f49f168b5d343d6aeccb8
Merge branch 'MDL-28108' of git://github.com/timhunt/moodle