Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle
commitd700fa463e0501b41b09c02961629a730e077530
authorDamyon Wiese <damyon@moodle.com>
Fri, 24 Oct 2014 03:23:53 +0000 (24 11:23 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:25 +0000 (24 11:48 +0200)
treef2925845b73b0d0ba18c0984ea4e6cfe5588cb32
parent0b9635cba419dea08739d7d6b6a73ac201ae0410
parent237f76ce14ede2d43cf2e460f9031780725486c8
Merge branch 'MDL-47838-master' of git://github.com/zbdd/moodle