Merge branch 'MDL-38020-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit418a05d7060814b2726baa7279daf8af9e1a6acd
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 04:23:49 +0000 (12 12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 04:23:49 +0000 (12 12:23 +0800)
tree9228ed7cf0e1d677876a7bcea98b9cfa5da9b207
parent0761304d2f4dcfb56b834100748232e0786fa9aa
parentb8b43072c2eab825117b62db33b7a16182279c9f
Merge branch 'MDL-38020-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE