Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 01:35:16 +0000 (09:35 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Sep 2013 01:35:16 +0000 (09:35 +0800)

Trivial merge