Merge branch 'MDL-29579' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 22:36:49 +0000 (23:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 22:36:49 +0000 (23:36 +0100)
commitbc4869a828cfdd2b5b8b1098db98569cc4a6e9bb
treea1152b4035aca9fe2865d8b92b2f4e4b9f7788b5
parent1f8c6a9012dc4c3ee652153c42a26245941d38cf
parentedfa0d800ff5cf52a021025183ab53b937b3d22f
Merge branch 'MDL-29579' of git://github.com/timhunt/moodle