Merge branch 'MDL-38397_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commitf6a52da112ae15637f689c29ee80d33baeec676a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:28:52 +0000 (19 12:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 11:28:52 +0000 (19 12:28 +0100)
treeff80e3f1edd81151a66f59c2476612d33e0199fa
parentd4ce77f6248ed7b628200d7691365eae40411a1f
parent3d8c5cb04496eb865583932cdbde8dfe5bcc779a
Merge branch 'MDL-38397_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE