Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:47:00 +0000 (11:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 May 2012 23:47:00 +0000 (11:47 +1200)
1  2 
mod/data/lang/en/data.php

Simple merge