Merge branch 'MDL-34654-master' of git://github.com/sammarshallou/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 07:22:43 +0000 (15:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 07:22:43 +0000 (15:22 +0800)

Trivial merge