Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 03:23:10 +0000 (16:23 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Mar 2014 03:23:10 +0000 (16:23 +1300)
commitf94bde7250025b16b08bf6c5ffce1d234864ebd5
treebba08e72c50cd82bf607e4ad9dcc71f465b2e5b6
parent11862768ceae3e141a01ca805bd67528a692cfc3
parentf381e6cdcce34d3a5c3f46a5547fd5348617d476
Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle