Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 11:33:16 +0000 (12:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 11:33:16 +0000 (12:33 +0100)
commit43bbf288494f7341345168ae558b2b83a267f1e2
tree4c2539cb327a9e67825ba8430ef2140b7b382236
parent2b1f6ced64216b30489aa4e898583f93a39e3061
parent28ec73dc5b87d93ff6de7c8b490ae5274f6ea390
Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle