Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict...
authorSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 21:33:00 +0000 (10:33 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 20 Feb 2012 21:33:00 +0000 (10:33 +1300)
commitda3ec93275f07f6d3d5ed3b457dc72596ac01c87
tree09c3c5187b43d30258e9e7d35c0efad3b8227d6f
parent6ff5994b496249e3fa086c94adbd31effb5535ef
parentbca2b1c1576eb08adde67071292954558f63ee29
Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution