]> git.defcon.no Git - hermes/commitdiff
git.defcon.no / hermes / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa019c1 3dd5301)
Merge http://git.defcon.no/hermes
authorJon Langseth <jon.langseth@hig.no>
Tue, 17 Jan 2012 18:08:51 +0000 (19:08 +0100)
committerJon Langseth <jon.langseth@hig.no>
Tue, 17 Jan 2012 18:08:51 +0000 (19:08 +0100)
1  2 
doc/api-nodes.txt patch | diff1 | diff2 | blob | history

diff --cc doc/api-nodes.txt
Simple merge
Hermes is a framework for managing a Kamailio SIP VoIP infrastructure.