Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager
authorchristian mueller <christian.ei.mueller@bmw.de>
Tue, 31 Jan 2012 16:51:40 +0000 (17:51 +0100)
committerchristian mueller <christian.ei.mueller@bmw.de>
Tue, 31 Jan 2012 16:51:40 +0000 (17:51 +0100)
commit0538d699f441beb81ab64b7f59cb87329667287a
tree43c12b6c6fdb0c5466762910b18891bfe9383eaa
parent1b659632bc7fa0c1daa021a2d52da390cedec9a7
parentbef6b6f38de4f6b201a1b6ce24855c8894031602
Merge branch 'master' of https://git.genivi.org/srv/git/AudioManager

Conflicts:
AudioManagerDaemon/test/routing/routingTest.cpp
CHANGELOG
includes/config.h