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)

Trivial merge