Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 14:31:38 +0000 (14:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Oct 2014 14:31:38 +0000 (14:31 +0000)
commitfb9604d67c7392f01207be5a757d3acbdef7b054
tree526987e2a50da1e874b7f2119045c4c38fa79451
parentf976c8e468cc43fa30ab180907c81cb206fd29d1
parent1d8e8494bf72d6195c90edd824ca6438e29a2f44
Merge branch 'MDL-47918-master' of git://github.com/andrewnicols/moodle