diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2012-02-23 16:59:22 +0100 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2012-02-23 16:59:22 +0100 |
| commit | 7d7c739cb3efc7d24ba67aa1a94d892daad74d4c (patch) | |
| tree | d583672e26058e29de062091f162d0ab81752850 /src/mod_muc | |
| parent | Avoid quadratic behavior in reading SSL data (diff) | |
| parent | Update copyright dates (diff) | |
Merge remote-tracking branch 'mainline/2.1.x' into 2.2.x
Diffstat (limited to 'src/mod_muc')
| -rw-r--r-- | src/mod_muc/mod_muc.erl | 4 | ||||
| -rw-r--r-- | src/mod_muc/mod_muc_log.erl | 2 | ||||
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 2 | ||||
| -rw-r--r-- | src/mod_muc/mod_muc_room.hrl | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl index 813aa63e2..893e5a26e 100644 --- a/src/mod_muc/mod_muc.erl +++ b/src/mod_muc/mod_muc.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2011 ProcessOne +%%% ejabberd, Copyright (C) 2002-2012 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -973,7 +973,7 @@ iq_get_vcard(Lang) -> [{xmlcdata, ?EJABBERD_URI}]}, {xmlelement, "DESC", [], [{xmlcdata, translate:translate(Lang, "ejabberd MUC module") ++ - "\nCopyright (c) 2003-2011 ProcessOne"}]}]. + "\nCopyright (c) 2003-2012 ProcessOne"}]}]. broadcast_service_message(Host, Msg) -> diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl index 8a7ba7038..47d4a3c96 100644 --- a/src/mod_muc/mod_muc_log.erl +++ b/src/mod_muc/mod_muc_log.erl @@ -5,7 +5,7 @@ %%% Created : 12 Mar 2006 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2011 ProcessOne +%%% ejabberd, Copyright (C) 2002-2012 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index ff709e172..0de2ebcc8 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -5,7 +5,7 @@ %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2011 ProcessOne +%%% ejabberd, Copyright (C) 2002-2012 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as diff --git a/src/mod_muc/mod_muc_room.hrl b/src/mod_muc/mod_muc_room.hrl index 915456b36..23f248687 100644 --- a/src/mod_muc/mod_muc_room.hrl +++ b/src/mod_muc/mod_muc_room.hrl @@ -1,6 +1,6 @@ %%%---------------------------------------------------------------------- %%% -%%% ejabberd, Copyright (C) 2002-2011 ProcessOne +%%% ejabberd, Copyright (C) 2002-2012 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as |