[Pkg-cli-apps-commits] [SCM] monsoon branch, master, updated. c267614274c2db2cde0185c9cc9a41029abbc1db

[Mirco Bauer]

The following commit has been merged in the master branch:
commit c267614274c2db2cde0185c9cc9a41029abbc1db
Merge: 610cd3e9a32a15a38c55bb3d78dded7dcaf0baa6 3a987c25dd9403cda2159c429bea3ef03c8c4c33
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Mar 14 01:00:32 2009 +0100

    Merge commit 'upstream/0.20+dsfg'
    
    Conflicts:
    	debian/changelog
    	debian/rules

diff --combined debian/changelog
index 31122d3,0000000..083664d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,6 @@@
- monsoon (0.20-1~pre1) unstable; urgency=low
++monsoon (0.20+dfsg-1) unstable; urgency=low
 +
 +  * TODO: DFSG: don't ship binary files in the tarball!
 +  * Initial release. (Closes: #475016)
 +
 + -- Mirco Bauer <meebey at debian.org>  Tue, 08 Jul 2008 01:07:40 +0200

-- 
monsoon