Merge branch 'MDL-19125_module_security' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 18 Mar 2012 21:07:57 +0000 (10:07 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 18 Mar 2012 21:07:57 +0000 (10:07 +1300)

Trivial merge