Merge branch 'MDL-28653' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:17:14 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Aug 2011 22:17:14 +0000 (00:17 +0200)
commitca00985a791e4216b3ee34bf7fddd0a6db719a85
treeecf79e67264f4fcc9a7224e8ca1818fe3187b72e
parente2c65492c83c13352864582d514ed41a3d5569ad
parent25d9a6a6647ed48c7f47dc5ce60349f0bc2c9ddd
Merge branch 'MDL-28653' of git://github.com/timhunt/moodle