Merge branch 'MDL-41004-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:46:17 +0000 (09:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Aug 2013 21:46:17 +0000 (09:46 +1200)

Trivial merge