Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 09:22:14 +0000 (17:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 09:22:14 +0000 (17:22 +0800)
commit53d9e41bb9173e8c59699d4ef4db5c8fa848e3c4
tree43635020d984bd1a2f0b9bf62f347582c40400de
parentb0b85f70d8075ab6cdceebbb7c28c485005165ef
parent1a780189c656c60e4c6e9d4d453585e2747373e2
Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle