[Pkg-cli-apps-commits] [SCM] pdfmod branch, ppa/karmic, updated. upstream/0.6-28-g7ad2c27

[Chow Loong Jin]

The following commit has been merged in the ppa/karmic branch:
commit 6b65fe148a366db1760f963e910f4eb3faf7dc9a
Merge: e53feeef163daefc32fcbc033fdffc26d9b06a3c 3c2d048ec286a7c08929e3f4f2f06456e466218b
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Thu Aug 20 04:32:14 2009 +0800

    Merge branch 'master' into ppa/karmic
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index fa4bb52,04f899b..9463166
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- pdfmod (0.5-1) karmic; urgency=low
 -pdfmod (0.6-1) UNRELEASED; urgency=low
++pdfmod (0.6-0ubunu1~ppa1~karmic) karmic; urgency=low
  
    * Initial release (Closes: #540155)
  
-  -- Chow Loong Jin <hyperair at ubuntu.com>  Sat, 15 Aug 2009 01:16:57 +0800
 - -- Chow Loong Jin <hyperair at ubuntu.com>  Wed, 19 Aug 2009 16:00:46 +0800
++ -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 20 Aug 2009 04:31:57 +0800

-- 
pdfmod