Merge branch 'MDL-38912' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:36:20 +0000 (01:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:36:20 +0000 (01:36 +0200)
commit70273fb6ae84ca8d5f294e601f718f8ba52fefeb
tree8dee0010924cc927ba56eec470f5f15b4365d159
parent196bd8c88525e0ef658ee5c64b09d415a573be75
parent82081c1f7d60b7c18b0385608d76de0667f36a10
Merge branch 'MDL-38912' of git://github.com/timhunt/moodle