Merge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 09:41:49 +0000 (17:41 +0800)
committerSam Hemelryk <sam@moodle.com>
Tue, 16 Oct 2012 09:41:49 +0000 (17:41 +0800)
commita896bc32cd9bfaffe19c3669fce4afef37ffb4d3
treedb2d23fa31e552ffb59979f8bf2e97f0854b5c43
parent4b3a647cfb2ee3a25c93c9098959291d767eaf57
parenta8397303d2289d15dafe02c03476c7b00f86331e
Merge branch 'MDL-35412-master' of git://github.com/FMCorz/moodle