Merge branch 'MDL-27840-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE
commit0761304d2f4dcfb56b834100748232e0786fa9aa
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 03:49:09 +0000 (12 11:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 03:49:09 +0000 (12 11:49 +0800)
tree3034635d634112c7838a4016166b50e147327877
parent7f7b3c1b5be98ab713b30eb4e3a5c75137ba6349
parentaade13141c581c589e7e50adc0c281a81e2ab1bb
Merge branch 'MDL-27840-30' of git://github.com/danpoltawski/moodle into MOODLE_30_STABLE