Merge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2011 09:38:40 +0000 (10:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2011 09:38:40 +0000 (10:38 +0100)

Trivial merge