Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:16:57 +0000 (10:16 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 28 Jun 2011 02:16:57 +0000 (10:16 +0800)
commite2542e1faff9bd2708d6864c05942a9e923be081
tree5da24b40d1782d54443399d7f6ca05875ec06be2
parent256383c07d1a87f983474d650023d74cfae6bc83
parent4be8a7d55c543489abbe8066ccc877a780d64d94
Merge branch 's11_MDL-27866_pix_url_master' of git://github.com/dongsheng/moodle