Merge branch 'm22_MDL-31039' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
commit6badc27a661aa0f5ca8ff9f8eddd3ca12ca25319
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:41:47 +0000 (1 00:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 31 Jan 2012 23:41:47 +0000 (1 00:41 +0100)
tree657e0b8bf8757d7355b15362ce92c54c2044ad7e
parentc904d241d592b6bbeea6b5c49403d6a57aa4f7d4
parentbfeca9d6b9900b4db88b1f4da12a424960ee7578
Merge branch 'm22_MDL-31039' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE