Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)
commitf7e8e43f2d864767927f9b3ccc8792379579302d
treeea4062d84b5452616648c8b29f4e49b035a453ba
parentb55853ff63c71722134245627cb10469a8423781
parent7846a85bc1848271ee0632256c5a038986ba4947
Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle