Merge branch 'MDL-35238-deployment' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 9 Nov 2012 02:30:55 +0000 (10:30 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 9 Nov 2012 02:30:55 +0000 (10:30 +0800)

Trivial merge