Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 09:13:06 +0000 (10:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Apr 2015 09:13:06 +0000 (10:13 +0100)
commita671ebe866109081c4f9a9998b6c6dd7a8b0d2f7
treeab5f64d1060368e4fa5551034078a14d71452205
parent32b97a03f3cd20bb351b04d7cbc35168cfea8f17
parentd6e7a63d9a6dcb89676a0ec4de25803895950c32
Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle

Conflicts:
version.php
version.php