Merge branch 'MDL-29945' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 20:47:22 +0000 (21:47 +0100)
1  2 
lang/en/plugin.php
lib/pluginlib.php

Simple merge
Simple merge