[SCM] imview packaging branch, master, updated. debian/1.1.9c-12_exp1-12-g5478c2e

[Anton Gladky]

The following commit has been merged in the master branch:
commit 5478c2ee065da31346e5edfeab0fe9da9a4b1b6f
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 7 21:00:51 2013 +0200

    Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 78fe419..521faf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 imview (1.1.9c-12) unstable; urgency=low
 
-  * [f09f4ac] Remove ics-reader patch.
-  * [8f73401] Disable ics-reader due to a buggy code.
+  [ Sebastian Ramacher ]
+  * [d79ec89] Fix stack smashing in ics-reader.
 
- -- Anton Gladky <gladk at debian.org>  Tue, 12 Feb 2013 20:07:08 +0100
+ -- Anton Gladky <gladk at debian.org>  Tue, 07 May 2013 20:59:00 +0200
 
 imview (1.1.9c-12~exp1) experimental; urgency=low
 
@@ -31,7 +31,6 @@ imview (1.1.9c-11~exp1) experimental; urgency=low
   * [550a408] Use DEP-5 for copyright file, not finished.
 
  -- Anton Gladky <gladk at debian.org>  Wed, 06 Feb 2013 22:54:32 +0100
->>>>>>> experimental
 
 imview (1.1.9c-10) unstable; urgency=low
 

-- 
imview packaging