Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:31:53 +0000 (14:31 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Nov 2012 06:31:53 +0000 (14:31 +0800)
commitf2e1d671a9f9888b65a03ae9cfe8aa1021219261
tree82ffca9afdd0da74886714dd4a8825d525cda82b
parentf45ecda7f90ae9bb104cd205c6c64eea2a9dfd16
parent590e3ef0ee72ef245e4c79b5ccc9ed173bd17f59
Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle