Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 13:54:41 +0000 (13:54 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Oct 2015 13:54:41 +0000 (13:54 +0000)
commitd3cd5f1f8ff90d2c905192718d3c4ce0a153fe90
tree65cc033b4b3bb51f48116da25423417258752e4d
parent3ec49c6de3ef6a944d78c097af3771179d55ce6b
parentb71890687af3d6ad4b232fb139d5afbce80f2c15
Merge branch 'wip-MDL-51834-master' of https://github.com/kwiliarty/moodle