Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)
commit3a3e3fa3b5cbcefe4bee5762f6dc438a7054d3d2
tree1c4e667badea557d53298f50e43fd03158ce0f87
parentc7b6b27d775e01e68ed6cb7eb28474ddc58ed052
parent0c9070c0a31893bfb452519c59dead27ff58f47a
Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle