Merge commit 'origin/master' into dbus

Conflicts:

	.gitignore
	src/Makefile.am
	src/managerimpl.cpp

libs/libiax2/src/miniphone.h

+#define RBUFSIZE 256
+#define MAXARGS 10
+#define MAXARG 256
+#define MAX_SESSIONS 4
+
+extern void parse_cmd(FILE *, int, char **);

src/audio/alaw.cpp

@@ -23,9 +23,8 @@
 
 // 8 PCMA A 8000 1 [RFC3551]
 Alaw::Alaw(int payload)
- : AudioCodec(payload, "PCMA")
+ : AudioCodec(payload, "G711a")
 {
-  _officialName = "G711a";
   _clockRate = 8000;
   _channel   = 1;
 }