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)
commit0ed03cc295448048b5bf293873658eed6d791015
tree1290386b0ca57a418bcaeebbb053fe56629c9eaa
parent6155915ffbba47b36be1a17d8d6cddb99182130e
parent15c0b1ccefc17780189d966f36ce82c7b2122abd
Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle

Conflicts:
calendar/tests/externallib_tests.php
calendar/externallib.php
lang/en/calendar.php