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)
commit8a1b820bc58a86ed804ef6fbfb723e5837cca392
tree5faf332ae3d97f71e2b637082a0ce40bd0d6b5e2
parente034d84c4897d78cc711411e72d407625a57a209
parent0aa535bf1d26d26588a0ce45f444cd1b09213d75
Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle