Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)
commit588d3a7e1f39533d28365a524505a1adc7457276
treeca9dc778795683e69217db59edfe5c32f18ca35a
parentada7dbd93ad9196dff0ba1b8a6eb9b4553bc1034
parentd9bd472beebd965aae9e9f5382bbeb4df41f122f
Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle