Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)
commit0de0e38bc428c3efe0f42b59dbbcd40b0becb1ca
tree9ede2ed8c61f0af3e7e8e79cb5a93b131ef5c9df
parent1eee7ee3a0c3441e02c51e10eb3429166b084b17
parent1b40564829250287c9e66c40333e25001fb63914
Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle