Merge branch 'wip-MDL-27756-master' of github.com:marinaglancy/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 12:15:55 +0000 (22:15 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 12:15:55 +0000 (22:15 +1000)

Trivial merge