Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:50:19 +0000 (11:50 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 5 Jun 2012 23:50:19 +0000 (11:50 +1200)

Trivial merge