Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle
commita273391e4acac0c4a8458d25ada52e15bfcbd49d
authorSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:47:13 +0000 (22 09:47 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 21 Jun 2012 21:47:13 +0000 (22 09:47 +1200)
tree166a1ebcf749008b043891ce8c41f45434a06a38
parentc691963939655c65eb418e82715eea6c4d3d2197
parentc397e0c8bc387a0db701f2aeb58479894c2aff24
Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle