Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle
authorSam Hemelryk <sam@moodle.com>
Fri, 1 Jun 2012 01:42:01 +0000 (13:42 +1200)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Jun 2012 01:42:01 +0000 (13:42 +1200)
commit84ec16a86128efe87a28daeb7f0c9c7cd03b3755
tree7d39035e4e7cb042cc4966f204a526d9beb2292a
parent5669b28d59872045d72172c8a61468a839dc3be7
parentb7acfd645b4f71d3012e706f30dd4165c2b11e26
Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle