Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle
commitad5d189c93337da12cdf3a8c9c7c1ee0b98233ca
authorSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 23:38:03 +0000 (22 11:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 May 2012 23:38:03 +0000 (22 11:38 +1200)
tree36b78eb9807067e2a3ef7803b8fa9386b98f76ff
parentac12e3b42ebefaa6e17433177b8c19e7edfa0fe5
parentfc11586b03bdf0d62f6c2d31b81cb08a36e8d2c9
Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle