Merge branch 'master' into release

This commit is contained in:
snowleo 2011-09-05 14:15:07 +02:00
commit 96c4dd2ab9

View File

@ -427,7 +427,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
{
ess.broadcastMessage(this, Util.format("userIsNotAway", getDisplayName()));
}
return;
}
lastActivity = System.currentTimeMillis();
}