Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 04:30:44 +0000 (16:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 04:30:44 +0000 (16:30 +1200)

Trivial merge