Merge branch 'MDL-26109' of git://github.com/nebgor/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 21:10:37 +0000 (22:10 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 21:10:37 +0000 (22:10 +0100)
1  2 
blocks/moodleblock.class.php

Simple merge