Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle
commit668dae632aa64c92720e3b43daf5ab9f8dc82f7f
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 02:26:58 +0000 (19 14:26 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Sep 2011 02:26:58 +0000 (19 14:26 +1200)
tree7f4dc5b60b9d2ab7f80a85b9a35a076298892d21
parentcb2c93c8db2ce107a8f093c8b1626b8fceb3fcb8
parentb02578db42c493fb34b9f2e8f6e603ce8e164a17
Merge branch 'MDL-29276' of git://github.com/mouneyrac/moodle