Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:19:11 +0000 (15:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 14:19:11 +0000 (15:19 +0100)
Conflicts:
calendar/tests/externallib_tests.php

1  2 
calendar/externallib.php
lang/en/calendar.php

Simple merge
Simple merge