Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 07:48:33 +0000 (19:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 07:48:33 +0000 (19:48 +1200)
commit9f768d6e5fa1d3d8c0e3a4cd141616d487fb46c8
tree7c7fe2725f0f014837c67c7f68cd452aa23557c1
parentf8adfe6cc0be02bc469918b87a142c11581b241b
parent712dee7a59b95d44054b5857a3bf7850afecd90d
Merge branch 'MDL-29211_master' of git://github.com/kordan/moodle