Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 01:27:57 +0000 (09:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 26 Aug 2013 01:27:57 +0000 (09:27 +0800)

Trivial merge