Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle
commit1a3c5d23662dad8d714b248787fe451ec4d4c9c6
authorSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:19:27 +0000 (6 11:19 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 6 Jul 2011 03:19:27 +0000 (6 11:19 +0800)
treeb44a1d4361d04b65f9162fc869fff23aa2da0890
parent8323432992de4e0c20f32b86b1412deec07adaaa
parenta58f4d5595980b61acb4a793a7e6bee5ad563cac
Merge branch 'MDL-26626' of git://git.luns.net.uk/moodle