Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 4 Jan 2017 05:02:44 +0000 (06:02 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 4 Jan 2017 11:34:00 +0000 (11:34 +0000)
commit9afc02742bc4dfe1fd289f45bcc7fb9c46fbcb07
treec4ac428e1d87d2993051aa08a307052bb2a541f6
parent36bbf71a65901dbf9b09a8eff1de370a287d573c
parente68cdceee34307ebf1dc81b931e3e3bcaa1d58ea
Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle