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

[Ole Streicher]

The following commit has been merged in the ubuntu branch:
commit 9f48b2ee7f8d461158bdc8da6b54dff3622f4836
Merge: b6b67c95040301db4be709d280cdfaf0c46d0cc2 ab90af71e15eae5b3cf1b9761df554086f853cdb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Mar 1 16:41:48 2012 +0100

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

diff --combined debian/changelog
index 0a06ea5,7dbdcc3..13b85d9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- iausofa-c (2010.12.01-0~ubuntu1) oneiric; urgency=low
 -iausofa-c (2012.03.01-1) unstable; urgency=low
++iausofa-c (2012.03.01-0~ubuntu1) oneiric; urgency=low
  
    * Initial release. (Closes: #659639)
  
-  -- Ole Streicher <launchpad-cpl at ole.ath.cx>  Mon, 13 Feb 2012 14:48:21 +0100
 - -- 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