Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)
commit117dc470bc8402af5819de6fb26cae7784da2fd9
treeeeb0007e935510a9069950cd79c8bda80f10ef83
parent9dfe870449ceb38d0a48bfd40f5f7102cd9c198a
parentbe9b036a332e05d6bd54bd8b0584e7ec03e6e22c
Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle