Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 02:56:45 +0000 (10:56 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:55:32 +0000 (08:55 +0800)
commite9b7148ba7c7256775044c5d674211b350898cd9
treeeb5eb93eb4b7722baa103f3261ef2da4e3a9bc3c
parent51bd152e34b21f4c295aba25e799367548dc1784
parent4562fdc240fec4de4b42178a97f8f8000539b442
Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle