]> git.defcon.no Git - hermes/commitdiff
git.defcon.no / hermes / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31a5078 2672358)
Merge branch 'master' of http://git.defcon.no/hermes
authorJon Langseth <jon.langseth@lilug.no>
Thu, 26 Jan 2012 11:19:12 +0000 (12:19 +0100)
committerJon Langseth <jon.langseth@lilug.no>
Thu, 26 Jan 2012 11:19:12 +0000 (12:19 +0100)

Trivial merge
Hermes is a framework for managing a Kamailio SIP VoIP infrastructure.