Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle
commit21fd2384dee574e983342c55ceeb59594925d98c
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Apr 2014 07:44:39 +0000 (9 15:44 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Apr 2014 07:44:39 +0000 (9 15:44 +0800)
treecb2ceb8f530378da640f71ded0a74a70bc72229a
parentf68fee244a220f4b39a9fea3fe3db01136791527
parent488bbfb720879f81e52b9bb89b333032d9ccc256
Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle