Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:16:48 +0000 (16:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 08:16:48 +0000 (16:16 +0800)
commit715d0505c4ca444b90adfe2238ff3443d2efb058
treecf5e78cd6eef3796f53dfb55679aa2989b36c646
parentfcd640a51a78741ef559061201c03c56877e9ba7
parent80c2d360079eb3a65c93c264ae8beb4b283ac5c9
Merge branch 'MDL-43273-master' of git://github.com/andrewnicols/moodle