Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 00:44:49 +0000 (01:44 +0100)
commit0f6cc7a7cc2bb6a140e313b2eae4648913d7c6dd
treedeee3c41f018a78d6363af9c29ada92321575280
parentea46fcbcedff1a19b55749c52d473f9137ebe888
parent770b7f6c9f2decfdef76a7c351adcd6ff037c3a3
Merge branch 'MDL-30203-master' of git://github.com/sammarshallou/moodle