Merge branch '40976-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 07:02:05 +0000 (15:02 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Oct 2013 10:14:41 +0000 (12:14 +0200)
commitd4256630e75c3039637386d6de83a01287c7ebb1
treebb32efa3df062ffff594e5be08b30822d22c326d
parent3481222e5787e27ce13c7900412b4df54e05b729
parentf5593410afff8783bc81ee3fa0b0d24681d18b41
Merge branch '40976-26' of git://github.com/samhemelryk/moodle