Merge branch 'w28_MDL-27804_m22_csvauth' of git://github.com/skodak/moodle
authorSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 10:17:51 +0000 (20:17 +1000)
committerSam Hemelryk <sam.hemelryk@gmail.com>
Mon, 18 Jul 2011 10:17:51 +0000 (20:17 +1000)

Trivial merge