Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 01:07:37 +0000 (13:07 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 01:07:37 +0000 (13:07 +1200)
commita63d1e2871541ce14c640d6bc3b03e205095c0d3
treec831e67e8d022c372ad3428f80fafc0f76968535
parent934c70040c0a891d9382d4b1ee8f278ceded02ad
parent146893d62f4da09a9440d6a8220ab248dd473bd6
Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle