Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 22:54:35 +0000 (00:54 +0200)
commitf9d2eb4f20a1349b645647965522057f5f4366cc
tree21320ff470a09906fa60157118a8849022708e05
parent7ace3a21996122d90653b08e08ddfbbc0631ca69
parent5b5206e1cb83833342313b31cce478d5075cb4c0
Merge branch 'MDL-28099_wip' of git://github.com/jamiepratt/moodle