Merge branch 'MDL-28012' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:31:53 +0000 (00:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:31:53 +0000 (00:31 +0200)
commit2e27e2d64a8ba9f1738f85a449eb0a912be6452f
tree83c73760a7aad7601e7c161f072a2c6b33ddf8e2
parent89ad7c078ed5b7e3022c144df43678281ec02e02
parentc5da295b8516e7c556caa5118723815afb2ca9dd
Merge branch 'MDL-28012' of git://github.com/timhunt/moodle