Merge branch 'MDL-30377_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:52:32 +0000 (11:52 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:52:32 +0000 (11:52 +0800)

Trivial merge