Revision: 16046
Author: oleg.kulikoff
Date: Fri Dec 24 21:44:18 2010
Log: Resolve conflicts
http://code.google.com/p/mobicents/source/detail?r=16046

Modified:
/trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/SS7Service.java /trunk/protocols/ss7/service/src/main/java/org/mobicents/ss7/ShellExecutor.java

Reply via email to