Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 23 Oct 2014 22:58:36 +0000 (11:58 +1300)
commit29a30602658b97995dbbae0685be4f934b81d1cb
tree1581f5658ad9e29e6e4bc257b3ca8bcdc7c72ca1
parent124932d223357b9a520655843c46553301fe64e9
parent3275892c03f85d9e39115fe2fefda30ec1672292
Merge branch 'wip-MDL-47757-master' of git://github.com/abgreeve/moodle