Merge branch 'm20_MDL-26212_resizefix' of git://github.com/danmarsden/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 20:37:37 +0000 (21:37 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 20:37:37 +0000 (21:37 +0100)

Trivial merge