Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)
commit620ecd38d242e21838fa9918f9c2c865f474403f
tree885ca2ff1b1b68b7f0abb17830b7debbcea57ba7
parent644495114ee91aad38f3bf3a644b287edcf02c82
parent8d25aeb71163e4442e691cf72b58b28c2d1c4109
Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle