Merge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:48:32 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Dec 2012 03:48:32 +0000 (11:48 +0800)
commit00a9fa5d9afb4a06863a5f887a471b76775d9300
tree7f9c11f6a7dd587c5cd02c1960242bf4741517ac
parent06ae410844a62225025244cb0ecd739956df1999
parentb815ccd31975f43bd26fcaaf044dfe71a819fb13
Merge branch 'wip-MDL-35979-master' of git://github.com/phalacee/moodle