Merge branch 'MDL-38557_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit821c60617e210f474f528978baa99f65f9f80fb9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:41:31 +0000 (26 23:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Mar 2013 22:41:31 +0000 (26 23:41 +0100)
tree97643c9c7cad10d0ae340a4559429febd6ac980d
parent673ff9d82edd925d9f20081969bfe5c350878709
parent519c20adb8ca5e96d69d143ce14a13b76b172d1b
Merge branch 'MDL-38557_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE