[Pkg-cli-apps-commits] [SCM] widemargin branch, master, updated. debian/1.0.11-4-12-g2b3f62e

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit d4751bf290a91c7394bf7bc407860999a7bb4bd9
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Nov 20 19:26:24 2012 +0800

    Properly fix debian/changelog merge

diff --git a/debian/changelog b/debian/changelog
index 8066808..950c66a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,4 @@ widemargin (1.0.11-1) unstable; urgency=low
 
   * Initial release
 
-  * [834e6e9] update nunit.patch for 2.6
-
- -- Jo Shields <directhex at apebox.org>  Mon, 28 May 2012 23:28:02 +0100
+ -- Daniel Hughes <trampster at gmail.com>  Tue, 3 Oct 2011 20:48:00 +1200

-- 
widemargin