summaryrefslogtreecommitdiff
path: root/misc/mon_ami/asterisk.py
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-18 14:23:43 +0100
committerspag <spag@golwen.net>2013-01-18 14:23:43 +0100
commit5d535a508d9e84cbaf3cb8b5a21797f94b38f9ab (patch)
tree099438f250c56a1bcac404c82a0271c14a1a98ac /misc/mon_ami/asterisk.py
parent6994ba4b5fecc2d532770f922d76227a175e3d71 (diff)
parent8b37b125399ba4019091b83efe889dc8af89185f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Conflicts: misc/freeswitch/scripts/ini/routes.ini
Diffstat (limited to 'misc/mon_ami/asterisk.py')
-rw-r--r--misc/mon_ami/asterisk.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/mon_ami/asterisk.py b/misc/mon_ami/asterisk.py
index ffcff06..3406c5b 100644
--- a/misc/mon_ami/asterisk.py
+++ b/misc/mon_ami/asterisk.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# MonAMI Asterisk Manger Interface Server
# Asterisk AMI client connector
-# (c) AMOOMA GmbH 2012
+# (c) AMOOMA GmbH 2012-2013
from threading import Thread, Lock
from log import ldebug, linfo, lwarn, lerror, lcritic