Merge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 10 May 2012 08:54:35 +0000 (16:54 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 10 May 2012 08:54:35 +0000 (16:54 +0800)
1  2 
calendar/lib.php

Simple merge