Merge branch 'MDL-39444_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commiteb244d3b87eae3b093fcb948978a12ea7c982871
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 May 2013 14:55:25 +0000 (1 16:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 May 2013 14:55:25 +0000 (1 16:55 +0200)
tree182f815e3ed558efbd307b06517a83f1fc97609b
parentd8d636dfe4323c2fdeb79891890ccf4cee4dff19
parent0dc15de222e9910b545c97e4f93503a539dc1265
Merge branch 'MDL-39444_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE