Merge branch 'MDL-37020-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:48:05 +0000 (09:48 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:48:05 +0000 (09:48 +1300)

Trivial merge