Merge branch 'master' into future
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 22 Sep 2011 23:04:15 +0000 (01:04 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 22 Sep 2011 23:04:15 +0000 (01:04 +0200)
commitfed304b05065f9792b76c4de2b0dad87f4d3dd28
treeb2ceba0d0625692e8a8c6de535da74f3bb77ab34
parente09f591b6d945ea6f89f0124482a49322d0de482
parent874649bf64cf12cb640e02d15814739cec3c610c
Merge branch 'master' into future