Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:53:45 +0000 (11:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Nov 2011 22:53:45 +0000 (11:53 +1300)
commit34e05996c189359c50d65ae68608887e7ef93d54
tree8a870bd97a3b7e55baea333ba9420a12b76fd35e
parentb8c117e1267b42ee7ef2098903d96c8067a4c209
parente3b977ac837b7d318802cd688d578c77614272d1
Merge branch 'MDL-30319' of git://github.com/lazydaisy/moodle