Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 02:51:44 +0000 (10:51 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Oct 2013 02:51:44 +0000 (10:51 +0800)
commit92fbc0de262a9a6bacb67739a0c9657c7927e8a8
tree0d22cc0c04583bef403ff93161ebbba7c88f3c45
parentc713639b65296b9f570194c2123c39b3e71608e1
parent268bd2fe774f2563f3fe8607a4ec9f6b40a3875e
Merge branch 'MDL-42534-master-int' of git://github.com/FMCorz/moodle