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)
commit176cf1ca911b016d7fb35c10c3b703ada4c9ab7e
treee63ac44ef16cc01211476c936858d3aa59d7988c
parent60a1ea56d929451b4749aae7877d214511d0e6f9
parentd76acdbc1770e45ca4a87e5e448e30831dd13166
Merge branch 'MDL-51610-master' of git://github.com/merrill-oakland/moodle
lang/en/moodle.php