Merge branch 'MDL-41716-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 23 Sep 2013 21:37:10 +0000 (09:37 +1200)

Trivial merge