Merge branch 'w28_MDL-28348_m22_meta' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 09:37:49 +0000 (19:37 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 09:37:49 +0000 (19:37 +1000)

Trivial merge