Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:28:31 +0000 (08:28 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:28:31 +0000 (08:28 +1300)

Trivial merge