Merge branch 'MDL-34870' of git://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:52:48 +0000 (09:52 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Aug 2012 01:52:48 +0000 (09:52 +0800)

Trivial merge