Merge branch 'MDL-51610-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 02:22:18 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 02:22:18 +0000 (10:22 +0800)
1  2 
lang/en/moodle.php

Simple merge