Merge branch 'MDL-51501-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 10:47:52 +0000 (11:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 10:47:52 +0000 (11:47 +0100)
commit93ca67d6379978bdd5d1143b2333dbc287d4a90c
tree82f3163492f2108255d716ec98e9c42e7b9c1601
parent61c257e7eeaa59966b56410b290c7916b816c89f
parent0e55333a86ecdda78d149e347b41c673dd6b6c07
Merge branch 'MDL-51501-master' of git://github.com/merrill-oakland/moodle