Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:02:16 +0000 (10:02 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:02:16 +0000 (10:02 +0800)
commit94ffa4a183c61ddebcc40661256334c350682eac
treef80cbb6fdc4beb565d53e5b9b760a8816ded0672
parent8306a3799ef4a05aa709bca8aa829b2f3ca8d82d
parentb7d7aafada5f86d4ade38f92a4ec2183072cd3fd
Merge branch 'w29_MDL-28392_m22_capnames' of git://github.com/skodak/moodle