Merge branch 'MDL-24984' of git://git.luns.net.uk/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:38:16 +0000 (14:38 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:38:16 +0000 (14:38 +0100)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge