Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:03:08 +0000 (10:03 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 09:03:08 +0000 (10:03 +0100)
commit387cb9586efb44d26263d65d5a2b23161519ad32
tree598c4c76fe52ecd7a357f832f3367121e4e5514b
parent973840f7d59001e4a8567b63d6f4160d4aad189d
parent8ef43cfde6b6b58ea82c676377407bb6ced26ed3
Merge branch 'MDL-47576-master-fixup' of https://github.com/jethac/moodle