Merge branch 'master' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 4 Jan 2011 12:45:52 +0000 (13:45 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 4 Jan 2011 12:45:52 +0000 (13:45 +0100)
commit581a32cd736b186e4149af4d7af350b4d44eb99d
tree4a3b760661290d719add8c3460f5a4fc956219ac
parentc3f347af4ddf3cc52fe3d8e89a361746d1f5067d
parent6a25698b1ff48bafd6d1656be7f447638cc4b136
Merge branch 'master' into experimental