Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Dec 2012 01:24:47 +0000 (02:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Dec 2012 01:24:47 +0000 (02:24 +0100)
commitee22329a9045106e3f5314127c465e8b3bef314f
tree46f348e1095988e04fa44bb89e5916f357b872dd
parentfa1415f193ec9eb285ee75d354759aca903954a5
parentcc52e16c4ab70cf7b921373c4ca82ee6b3c8a8e4
Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle