Merge branch 'MDL-40468_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 03:47:21 +0000 (11:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 22 Jul 2013 03:47:21 +0000 (11:47 +0800)

Trivial merge