Merge branch 'MDL-38912_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commitf6a2e02702ecbfac75c8ae5dd59ab8b81c98295b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:39:49 +0000 (9 01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2013 23:39:49 +0000 (9 01:39 +0200)
treee6e9787a92c3a7cdf4c43aa91ae5480383879b86
parentd11c78a1275d2d842ee9838b05625b2cce12d645
parent1e659c865ae733d3c0e9192926d173623702e097
Merge branch 'MDL-38912_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE