Merge branch 'wip-MDL-26747' of git://github.com/sammarshallou/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 18:06:28 +0000 (19:06 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 21 Mar 2011 18:06:28 +0000 (19:06 +0100)

Trivial merge