Merge remote branch 'remotes/origin/fantempplugin'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 18:01:59 +0000 (19:01 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 5 Jan 2010 18:01:59 +0000 (19:01 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge