Merge branch 'MDL-16464' of https://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 2 Oct 2013 19:34:39 +0000 (08:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 2 Oct 2013 19:34:39 +0000 (08:34 +1300)

Trivial merge