Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:44 +0000 (13:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 05:31:44 +0000 (13:31 +0800)
commit2bbf03ce3bc80d387a025343bc5ffaa5478997bf
tree6153f3032fc9755b7ee7c39c5ba054d2cc2b85c5
parentb10a5376d15d068f222ed24f8432001cb5ab8eba
parent43aadf0401792e55785389bba2f17a0b176285a6
Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle