Merge branch 'MDL-32924' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)
commit6265a43af7004fead9106931871dee6eb3e918e4
tree3bf33cb6cf44c29b5b1425eaca11626defdb5fab
parent1c7eb3df38954a9ef4e6f91a40e0c5188861b83a
parent667c09072810384404ba4572becfc5103bb583d5
Merge branch 'MDL-32924' of git://github.com/timhunt/moodle