Merge branch 'wip-MDL-36276-m24' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 06:52:09 +0000 (14:52 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 16 Nov 2012 06:52:09 +0000 (14:52 +0800)
1  2 
calendar/lib.php

Simple merge