Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 01:26:58 +0000 (09:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 01:26:58 +0000 (09:26 +0800)
commit13410584be25c6e8edc23f71ffbeb5dbbd00769e
treeb6f6c4f68358a6d218795fb6a35a74e9fca66bb0
parenta59a423926c0688954ecc6e70e011179ce430438
parent7a3723219c7a6cdce99f72a55942d900421778dc
Merge branch 'MDL-40939-master' of https://github.com/timgus/moodle

Conflicts:
filter/tex/version.php
lang/en/admin.php
filter/tex/db/upgrade.php
filter/tex/settings.php
filter/tex/version.php
lang/en/admin.php