Merge branch 'MDL-53327-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 00:48:44 +0000 (08:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Mar 2016 00:48:44 +0000 (08:48 +0800)
1  2 
lang/en/plugin.php

Simple merge