Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 06:51:31 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Aug 2013 06:51:31 +0000 (14:51 +0800)
commit02852c45b5797066dc9830f2991d8ed49f3f13ea
tree2ff6800058a4d1e54315d5ca3c177c07b83949a5
parent178d901cf98a4395f580a37f894279f47e87fe46
parent70b4027b521df2c1b6d500ed06187ccb5442a1d9
Merge branch 'MDL-36002-master-fix1' of git://github.com/damyon/moodle