Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:21:26 +0000 (11:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 03:21:26 +0000 (11:21 +0800)
commit96d0198b8acec63cfe85d6cd61a164f6db2888e8
treeea46d7c4f0b22a9e85365006272d1ddd653f994a
parent4baf482daa4b6d652a3c6d18c8561f1852634c39
parenta6989aa6e93ead31d9bde98c85a847c2e6e88175
Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle