Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 07:21:25 +0000 (15:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 07:21:25 +0000 (15:21 +0800)

Trivial merge