Merge branch 'w02_MDL-37483_m25_redirect' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:29:55 +0000 (23:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Jan 2013 22:29:55 +0000 (23:29 +0100)

Trivial merge