Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:21:56 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 02:21:56 +0000 (15:21 +1300)
commit7554371cd9b951aa3a289529bdb452bd0a4219eb
treefc1d8e2cac97178367a6411b9453aea30ac312af
parentc3f90a5722a951ee3dfb1804fc9966eeb45f1819
parente580c65962782c1b5d1a20809cd3e22fdd55dd73
Merge branch 'MDL-30500' of git://github.com/lazydaisy/moodle