Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Oct 2013 05:19:27 +0000 (13:19 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Oct 2013 10:11:48 +0000 (12:11 +0200)
commita8261e2830067c74dd5279145dba15c485572285
treec60a1f87a41387d9da24b321f11f301fb7599ac9
parent0c7c5e767c852a5633cde8b22a13ccebe795e8c5
parentee4ece6822ee94496f307a3fa8ed3dff562df8ef
Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle