[SCM] an open source computer algebra system branch, master, updated. 99cab34cc0ed9ba9ef7a7aa34a2cb8414d3e2485

[Felix Salfelder]

The following commit has been merged in the master branch:
commit 99cab34cc0ed9ba9ef7a7aa34a2cb8414d3e2485
Merge: ad54f9db4ce375b1da1f986312cd167bb6d79d56 21e98881f2afdfdd4a62690d7fac6fbba27de9aa
Author: Felix Salfelder <felix at salfelder.org>
Date:   Wed Mar 20 22:29:07 2013 +0100

    merge patched into master

diff --combined debian/.git-dpm
index 58b8f83,0000000..505b065
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
 +27e029636862d5ac4d8c20c466d37e79f762e7f8
- f04a692174b5b596ed2b8b5f30ce7d904855f7a0
++21e98881f2afdfdd4a62690d7fac6fbba27de9aa
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +b7a79f71f3462339b70b598a5756e06ee0d6639e
 +singular_3-1-6.dfsg.orig.tar.gz
 +a970d278087f954d6e3ff439027b1a4dd6e7eb22
 +20108290

-- 
an open source computer algebra system