Merge branch 'MDL-36845' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:58:44 +0000 (11:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Dec 2012 03:58:44 +0000 (11:58 +0800)
commitcdb7110f72c14d8ba512dca5272b93daf8bdcb65
treeddaf13feaa6d20c805308e2420b6c7ea4cdfd556
parentfa18df40c11ea9d44aea68cdd7aaaf52e446327d
parentbf4045599c808c594f5132db0b708bd27ef9e14d
Merge branch 'MDL-36845' of git://github.com/timhunt/moodle