Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 23:08:12 +0000 (12:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Dec 2011 23:08:12 +0000 (12:08 +1300)
commit302991ba371f7a923a0ae258e38b6fa3d3d7192d
tree365bee504258c4577637e3e2c03546990dc01676
parent746e7c4a5e8701440c90e9eae428a40af734373c
parent6b3a341a953e553683520d85affef44418d4b7ce
Merge branch 'MDL-30653-master-2' of git://git.luns.net.uk/moodle