Merge branch '46499-28' of git://github.com/samhemelryk/moodle
commit0b9635cba419dea08739d7d6b6a73ac201ae0410
authorDamyon Wiese <damyon@moodle.com>
Fri, 24 Oct 2014 01:56:55 +0000 (24 09:56 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:24 +0000 (24 11:48 +0200)
tree8b2880d157b9b93319e2e388115e88358fbc5064
parentfad1a02d2147903307a846302c84ad4cbface2c7
parent30aca4a74b076375b326e88b1a2fc637be0d6965
Merge branch '46499-28' of git://github.com/samhemelryk/moodle