Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:42:17 +0000 (09:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:42:17 +0000 (09:42 +1300)

Trivial merge