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)
commit8d6540ffd17a5f6098ec80c0d7e9385103c6d972
treec46583ddf1faeb68e0d642ef632557e9d930a405
parentb13dbc43d763c37a7458fe71793f17e88deeb179
parentaf08a48b2dd470e00036459ca111109cfaadb926
Merge branch 'w36_MDL-29257_m22_uniqid' of git://github.com/skodak/moodle