Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Mar 2013 07:01:02 +0000 (15:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Mar 2013 07:01:02 +0000 (15:01 +0800)

Trivial merge