Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 09:04:35 +0000 (09:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Dec 2015 09:04:35 +0000 (09:04 +0000)
commit6c0bf99b5b71be74d6da8eb0450bb143c243df0a
treed4252cc48f14ba385758b2f1d7f75fc271ec6915
parent0575c5ad8c12b32092bbb0e8e0e73b1fc5ae109e
parenta75f1dbc4f88373928dd0987cdb33351c318d23a
Merge branch 'MDL-50258_master' of git://github.com/dmonllao/moodle