[SCM] Packaging for getfem++ branch, master, updated. debian/4.2+dfsg1-1-11-gb894e1a

[Anton Gladky]

The following commit has been merged in the master branch:
commit c69b32f9a01b35efdaf7f378b96b1d77215b116d
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Jun 30 19:05:15 2013 +0200

    Minor fix in changelog.

diff --git a/debian/changelog b/debian/changelog
index 62940ac..dea6b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,7 +55,6 @@ getfem++ (4.2-1~exp1) experimental; urgency=low
   * [2f138f5] Update TODO.
 
  -- Anton Gladky <gladky.anton at gmail.com>  Wed, 07 Nov 2012 22:10:36 +0100
->>>>>>> experimental
 
 getfem++ (4.1.1-10) unstable; urgency=low
 

-- 
Packaging for getfem++