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)
commit09d64cadee44faf143b5871bb91d158f63054ec5
tree588b47681b3ffd92c5c3fddf6d7633d7f940beba
parent55a8b2eefc5c195fbb74a4fe61c25b2885c21b26
parenta7026767bfe68de5946a630c24c38d339cb7d036
Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle
mod/data/lang/en/data.php