Merge branch 'MDL-30739_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
commitceec817f9586322ceee8f0cb6c603dd36b84402e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:30 +0000 (20 02:21 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 01:21:30 +0000 (20 02:21 +0100)
tree42a27a855fee82b295eb6ca3cd8280ced5b54390
parent0cba7c0408f54453c61170cc1831291b22491038
parentabe73c6d9985dea94b93b9574257ab80f5034d29
Merge branch 'MDL-30739_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE