Merge branch 'wip-mdl-36303' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 03:57:58 +0000 (11:57 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Nov 2012 03:57:58 +0000 (11:57 +0800)
1  2 
calendar/lib.php

Simple merge