Merge branch 'bug_689_projectx_subs' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 3 Mar 2011 23:06:32 +0000 (00:06 +0100)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Thu, 3 Mar 2011 23:06:32 +0000 (00:06 +0100)
commit6bb0be9d2f3b9862bc35e08e5ab82870d98e6676
treeeba9870fd747182c40607f1141eaa53e31fbec58
parentd0b930ead23a8e38f08461ed3408c57afd01bd75
parentaba787cc8d9a47fcf3513f92835dac46836968a5
Merge branch 'bug_689_projectx_subs' into experimental