Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 00:36:44 +0000 (01:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Dec 2011 00:36:44 +0000 (01:36 +0100)
commit08f2d600c1a7bdc610e3d677cd24bda89670930d
tree11930673dc56dc8fcf2f5173b6fdb276806454ea
parenta8c3a5673f8632cb31444986b2e80426844e966c
parente52a5d3ab2d6dbb9c18047d2f7b1a23a05830fd3
Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle