Merge branch 'MDL-35053' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 31 Jul 2013 21:47:57 +0000 (09:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 31 Jul 2013 21:47:57 +0000 (09:47 +1200)

Trivial merge