Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 01:17:37 +0000 (13:17 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 21 Aug 2013 01:17:37 +0000 (13:17 +1200)

Trivial merge