Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 15:51:45 +0000 (16:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 15:51:45 +0000 (16:51 +0100)

Trivial merge