Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle
commit9b9e2655d20aab4c6472912f3b03e49840b261fb
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 09:53:49 +0000 (11 17:53 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Mar 2014 17:32:49 +0000 (13 18:32 +0100)
treefa90413c32dc960b4b0b9d0d282424e6ea7cc3cd
parente6496624896bd2ddf661b398b76c28f14b3bc4e9
parent502d5809708532ce13664c1342153234c596f7c3
Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle