Merge branch 'MDL-29677' of git://github.com/stronk7/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:03:39 +0000 (12:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 9 Oct 2011 23:03:39 +0000 (12:03 +1300)
commit36a42c57d103856ea7fabd291137f540674b86f8
treeeb69adca37ea100a2a3106aa1ad2d93a7822bac4
parent19f7391c50b67314e8ec74f60425fb29fa81c6fb
parenta7f99cf02ee9ed0374a86a1f22da114e1edc01b2
Merge branch 'MDL-29677' of git://github.com/stronk7/moodle