Merge branch 'MDL-30742' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:37:10 +0000 (11:37 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Dec 2011 22:37:10 +0000 (11:37 +1300)
commit6ccf06637fb74d8e00ecbd9f88e5bf5264dba05a
tree2aa6ba8e415ec51e7775174540c699e7ee90dd6d
parent09608abe56afc50fcd94eb9347950c843e359333
parentb5f65ba14cfa8d940563face1ef61b271dd8a0e6
Merge branch 'MDL-30742' of git://github.com/timhunt/moodle