Merge branch 'MDL-35055' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:16:14 +0000 (16:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:16:14 +0000 (16:16 +0200)
commit6b2b869049655e524f859fd7ea18f577b9365b0f
tree522ff7044f97676d801280f8329d740a7aba13ba
parentaec4783bf6abfae27a7e2ce30ec8a5379bab03b4
parentaa5f05110f7a3a00f53cc670ec1885658ebd474c
Merge branch 'MDL-35055' of git://github.com/timhunt/moodle