Merge branch 'w04_MDL-31176_m23_groupcontext' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 00:28:56 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 00:28:56 +0000 (01:28 +0100)

Trivial merge