Merge branch 'MDL-29095' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 11:05:36 +0000 (12:05 +0100)
commitab9dde2f97212ceda7f06bb209deac8c0bd0573e
treee7561858cfcabd92c154dd4ff3073bbc4bbed20c
parent48e74d2c10d8f184c9c8cf0ceeed6a2e39424a6f
parent106777513117c4d8ca5f38a569e9db5be15ab3ab
Merge branch 'MDL-29095' of git://github.com/timhunt/moodle