Merge branch 'MDL-31680' of https://github.com/ppichet/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 06:53:19 +0000 (14:53 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jun 2013 06:53:19 +0000 (14:53 +0800)

Trivial merge