Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)
commit33815b4b7e1ec189b81d8b2f4d05b4d021dd1d09
treec499d1b88315ed0b2c6b7e0ed2d61d26bad5a706
parent45edc141260fcbecc1325938f2073c102a73a48b
parent5f79b34b5e886d30ebce09d9db344109b32a1046
Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle