Merge branch 'workshop_random_allocator' of git://github.com/mudrd8mz/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 18:02:55 +0000 (19:02 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 17 Jan 2011 18:02:55 +0000 (19:02 +0100)

Trivial merge