Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:15:23 +0000 (15:15 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 21 Nov 2012 07:15:23 +0000 (15:15 +0800)
commite5556885ebc80330d3a4cf06dcf164ff90d7f5d3
tree3c16900e2dbfe32a55c2185b747f66766c15a90f
parentc9f5160438b7fe5dab5460184854cbabd385e56f
parent58e4233ecb4e547996f9858c7b4894e38f988171
Merge branch 'MDL-36639-master-int' of git://github.com/FMCorz/moodle