[SCM] Algorithms for models in fundamental astronomy branch, ubuntu, updated. e1120a6a76da7de91fce7ef5cc7734446ad84ab5

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit e1120a6a76da7de91fce7ef5cc7734446ad84ab5
Merge: e5b49500d3a25296c3ebdaaaa3489a0da7d12c0c aa3191a99b6df9b57f6c7d17dbf35174f164a684
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 11 13:08:54 2012 +0200

    Merge branch 'debian' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 2248c7f,d930fbf..a93d15f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,13 @@@
- iausofa-c (2012.03.01-2~ubuntu1) precise; urgency=low
 -iausofa-c (2012.03.01a-1) UNRELEASED; urgency=low
++iausofa-c (2012.03.01a-1~ubuntu1) precise; urgency=low
  
+   * New upstream version
    * Multiarch support
+   * Add "DM-Upload-Allowed: yes"
  
-  -- Ole Streicher <debian at liska.ath.cx>  Mon, 09 Jul 2012 09:56:46 +0200
+  -- Ole Streicher <debian at liska.ath.cx>  Mon, 11 Jul 2012 11:52:16 +0200
  
  iausofa-c (2012.03.01-1) unstable; urgency=low
  
    * Initial release. (Closes: #659639)
  
 - -- Ole Streicher <debian at liska.ath.cx>  Thu, 01 Mar 2012 16:45:00 +0100
 + -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Thu, 01 Mar 2012 16:45:00 +0100

-- 
Algorithms for models in fundamental astronomy