Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle
commit2c89eeeb8ee6f30f6432a4077bf9bb9466b44ff4
authorDamyon Wiese <damyon@moodle.com>
Thu, 23 Oct 2014 07:38:35 +0000 (23 15:38 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:05 +0000 (24 11:48 +0200)
tree555f3bc81a535d940927c3ba2029e46e47cadd3c
parent1e3dc6ed9cd39a822c2f74092ad79efb74afac2c
parent780ff300a833a8fe7e9feeb5e9d098262f87877e
Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle