Merge branch 'MDL-16464' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 03:34:51 +0000 (16:34 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 30 Sep 2013 03:34:51 +0000 (16:34 +1300)

Trivial merge