Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Nov 2013 06:22:28 +0000 (14:22 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Nov 2013 06:22:28 +0000 (14:22 +0800)
commita6b35417c0587eb8e137a0ad50082dc6e8cb07ce
treecc1083431e2d70da155702f33a398e0c85337f06
parent0b11609944335a759444bd808861447ce817dec9
parentb2ea1793389a82ee8d02f14d3d8d992cae6f862e
Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle