Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle
commitd1d7d9fd74dfb5b3b2931dd40d2feb7be52ed005
authorDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 14:18:31 +0000 (1 15:18 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Sep 2015 14:18:31 +0000 (1 15:18 +0100)
tree79bd58049e9fa8c771874a2b8dda3e79a9a59b39
parent7d8684c552d9dba62de079bc4dbbf4f51b7a6506
parent4463f996c40eb99360c6b856f34a71566ba6cf37
Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle