The following commit has been merged in the test-build branch:
commit 527f93130e0c8c599a7ae1e902dd22caefdb30cb
Merge: 29b2e268cdeb93e30bc8ce7ea27e6c47c1ff671f 
f29e54ab5ccf99376dfb3a9ac824ea795c260e10
Author: Raphael Hertzog <[EMAIL PROTECTED]>
Date:   Fri Dec 5 09:07:17 2008 +0100

    Merge branch 'master' into test-build
    
    Conflicts:
    
        ChangeLog
        debian/changelog
        man/po/ChangeLog
        po/ChangeLog
        po/ja.po
        po/ko.po
        po/pt.po
        po/ro.po
        src/errors.c


-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to