[pkg-fso-commits] [SCM] auxlaunch branch, debian, updated. debian/0.5-2-1-5-g85f7708

[Joachim Breitner]

The following commit has been merged in the debian branch:
commit 804409b568b096f7694656abc3258cdf913e826c
Merge: 66d578a499c2d2c90a0d07062e0da67cfbce2c42 c9390aeb884d387534f4b83eb84238a460e078ef
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Dec 1 16:27:22 2008 +0100

    Merge commit 'upstream/0.6' into debian
    
    Conflicts:
    
    	auxlaunch


-- 
auxlaunch