Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:42:17 +0000 (09:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Dec 2012 20:42:17 +0000 (09:42 +1300)
commit3dd842ebfb6f88add44ee486368a7f33bfb63c70
tree1f82eeae8ba8f74fc984b3547275cbb4505fda52
parent5f27d134543067366befe7ce5618421a7402b6f7
parentb84a84258cdbccd8549e117a7ff6c52d3c7a6eca
Merge branch 'MDL-36601-master' of git://git.luns.net.uk/moodle