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)
commitbb608148a9e542ed4f0cdd4962d49a3e1b055747
tree86de8fa7b3bdf29a80c1c29d0dccd4aa21c00112
parentce84cbacb7168fb1cde437c5987d4285a2157402
parent63def597a64fea047c4d2ec38ea5a80c20f223cc
Merge branch 'MDL-36950-updates-proxy' of git://github.com/mudrd8mz/moodle