[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. milestone5-180-g5848db1

Mon Feb 2 21:49:03 UTC 2009

The following commit has been merged in the debian branch:
commit 04652c3a255a8bf47c5d1f4f2feeb9728f502ac7
Merge: 7069ffb4c964f17b642927d0b2ad930f776e7abe 700ab8250582767628165b7cf6f671ef756ba56d
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Feb 2 20:01:32 2009 +0100

    Merge commit 'upstream/0.8.4.9-20090130' into debian
    
    Conflicts:
    
    	framework/controller.py
    	framework/subsystem.py
    	framework/subsystems/ogsmd/gsm/channel.py
    	framework/subsystems/ogsmd/modems/ti_calypso/channel.py
    	framework/subsystems/ogsmd/modems/ti_calypso/mediator.py


-- 
FSO frameworkd Debian packaging