Merge branch 'MDL-36170_master' of https://github.com/jfilip/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:47:17 +0000 (11:47 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 03:47:17 +0000 (11:47 +0800)

Trivial merge