Merge branch 'MDL-34629-master' of https://github.com/mackensen/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:19:32 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Aug 2012 06:19:32 +0000 (14:19 +0800)
commit3e002fa590afc59a66818496da997ac707df6187
treee14339ddcc8fdc43bb1654475f214ab7f3655ffb
parentc3ce4c212efdcd9a305193770180f49d8f0e9fc2
parent94efdedcc385a705411ebf61777bd614bc5d6b72
Merge branch 'MDL-34629-master' of https://github.com/mackensen/moodle