Merge branch 'MDL-35147_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 18:12:31 +0000 (20:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 18:12:31 +0000 (20:12 +0200)
commitf1f174e2bfc4092f0629bdebb571ee7613ce5dee
tree91c8aa312f4ccee203e623992649c478f8fd704f
parenta1db53480ce6c77c1d32c54807e1dd37f2dbb4c9
parent5fe6d4124558772a9c8f79b75c43182d78c70352
Merge branch 'MDL-35147_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE