Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 24 Sep 2013 10:00:24 +0000 (20:00 +1000)
commit72f6cb3cd3b8789e470d6ac3234d67c97a347e49
treeff26040934ebd3a483981c055a0a1ffda5457a7b
parent40643dcaad96e4c73b57c8c995ca87d208361c5e
parentb97d94ffbb5b8ce2c4f275d7d6ed3d778149bd46
Merge branch 'wip-MDL-39962-master' of git://github.com/abgreeve/moodle