Merge branch 'MDL-30145' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 23:25:45 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 23:25:45 +0000 (00:25 +0100)
commitf3bf5eba51cab174422bd705e4eb44a335e05ebc
tree99cc4a46c3568eccb6f7a53115c7d69fb4ada1b4
parent3c37f0adbc4684b8d600da3f698507ad34a690ad
parent9d5687893a061b9407f0714fde700afc0d2e3f07
Merge branch 'MDL-30145' of git://github.com/timhunt/moodle