Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 06:19:14 +0000 (14:19 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Nov 2013 06:19:14 +0000 (14:19 +0800)
commitb74c8389b1fe7cd6f3ded2d8f7dfa84c2fa92800
treeef7b05e54b32ff54d3be911c3a112801c6f9e249
parentcc58ba267d6ec19f47ffa6fa02a4e33b79fcb931
parent7cb353ff69f408d1a763a078a6d581f315f260a8
Merge branch 'MDL-42666-master-fixup' of git://github.com/FMCorz/moodle