Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/command.php

diff --cc EVENTS.txt
Simple merge

diff --cc lib/command.php
index 30db9d0691762bdfa2372ebee8326f13e1140263,2b61a0c80878cfb5330a51eff89d7dc4978d6be2..90a321ad323385831ec3cefeb657de6d76a0daa9
--- 1/lib/command.php
--- 2/lib/command.php
+++ b/lib/command.php
@@@ -678,7 -719,8 +719,8 @@@ class OffCommand extends Comman
      }
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
+             // TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->off($this->user)) {
@@@ -701,7 -745,8 +745,8 @@@ class OnCommand extends Comman
  
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
+             // TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->on($this->user)) {

diff --cc lib/util.php
Simple merge