Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:39:02 +0000 (00:39 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 14:39:02 +0000 (00:39 +1000)

Trivial merge