Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 30 Nov 2015 07:52:46 +0000 (15:52 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 30 Nov 2015 07:52:46 +0000 (15:52 +0800)
commit58fe694167195b1592b2903d5cc78bb133e08985
tree8988ca26a79ddda4f1969e4e7f582a70a155aca4
parentc256bac87921728ae7508cb908536bdb80ed45f3
parent560c7d6afa48d1dd31c926592bf26ba87c972231
Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle

Conflicts:
lang/en/deprecated.txt
lang/en/grades.php
lang/en/admin.php
lang/en/grades.php
lang/en/hub.php
lang/en/moodle.php