Merge branch 'MDL-34270_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:14:13 +0000 (16:14 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Nov 2012 08:14:13 +0000 (16:14 +0800)

Trivial merge