Merge branch 'bug_538_ignore_global_actions_in_standby'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:41 +0000 (12:02 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:02:41 +0000 (12:02 +0200)
commitd04e6435efecf42a192a4f6c71dca9a1a053d5fb
tree507eeb307a39e048edaefc6b4c2e82ce3a739d7b
parent5928c8c18abacbedd119752fe294a9393da6d2f7
parenteedaa114b5af841f0e4442274d4408be98d956ce
Merge branch 'bug_538_ignore_global_actions_in_standby'