Merge branch 'master' into devel

Conflicts: classes/CommandInterpreter.php lib/twitter.php lib/util.php
2009-01-06 17:09:39 -05:00 · 2009-01-06 17:09:39 -05:00 · 02877224b2
commit 02877224b2
parent 4bb522c3fa d3b1c1af16
1 changed files with 4 additions and 3 deletions
--- a/classes/CommandInterpreter.php
+++ b/classes/CommandInterpreter.php
@ -105,6 +105,7 @@ class CommandInterpreter
                return new GetCommand($user, $other);
            }
         case 'd':
+         case 'dm':
            if (!$arg) {
                return null;
            }