Merge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:23:21 +0000 (13:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 05:23:21 +0000 (13:23 +0800)
commit4a67095710a69440c5c961275e70c6ffe773a9f5
treec8a5de7426fa0b64c17eb266ed82f032b4b89081
parentc62c77c0e89dc4e1611fad26e89b1535bb5fa8ad
parent01686636cecb64b68fc8600954049a564fe4cbc7
Merge branch 'MDL-36884-master' of git://github.com/FMCorz/moodle