Merge branch 'MDL-57101-master-fixup' of https://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 07:07:42 +0000 (15:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 1 Dec 2016 07:07:42 +0000 (15:07 +0800)
commit53cbfac2b902b5e788c720167f4b662ef199853a
tree5b1de7418776eecff666580c92475091fea1471c
parent8f5de6f268dab8dbdd765dca9251d6b181e347b4
parentb52c562a8cc0387d6b7385828bbf8db581963e3c
Merge branch 'MDL-57101-master-fixup' of https://github.com/FMCorz/moodle