Merge branch 'wip-mdl-25937-disableif' of git://github.com/rajeshtaneja/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 4 Oct 2011 02:52:57 +0000 (15:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 4 Oct 2011 02:52:57 +0000 (15:52 +1300)

Trivial merge