Merge branch 'master' into recording

Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp

Merge branch 'master' into recording
Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp
2ee8dbb5 · alexandresavard · 007abd23 · 9c27daf4 · 007abd23 · 007abd23
Commit 2ee8dbb5 authored Feb 05, 2009 by alexandresavard
--- a/www/templates/page_download.php
+++ b/www/templates/page_download.php
--- a/www/templates/page_features.php
+++ b/www/templates/page_features.php
--- a/www/templates/page_goals.php
+++ b/www/templates/page_goals.php
--- a/www/templates/page_home.php
+++ b/www/templates/page_home.php
--- a/www/templates/page_screenshots.php
+++ b/www/templates/page_screenshots.php