Merge branch 'MDL-57658-master-3' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Mar 2017 16:06:19 +0000 (16:06 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Mar 2017 16:06:19 +0000 (16:06 +0000)
1  2 
lang/en/calendar.php

Simple merge