Module: sip-router Branch: master Commit: e964ce8f377cd368b1326ef42bc9bef36d192179 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e964ce8f...

Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@edvina.net Date: Thu Dec 20 18:52:33 2012 +0100

Merge branch 'master' of ssh://git.sip-router.org/sip-router

Arrggh. Need to clean up my working directory before xmas. * 'master' of ssh://git.sip-router.org/sip-router: modules_s/timer: moved to modules folder

---