Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 02:44:54 +0000 (10:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 25 Feb 2013 02:44:54 +0000 (10:44 +0800)

Trivial merge