[singular] 03/45: merge patched-master-3-1-5 into master-3-1-5

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master-3-1-5
in repository singular.

commit 5609f651510da2baf1c5ec43f7ada390afef4f9b
Merge: 299f7b1 c03be66
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun Jul 14 08:55:45 2013 +0200

    merge patched-master-3-1-5 into master-3-1-5

 debian/.git-dpm       |    2 +-
 factory/cf_chinese.cc |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 00ecb7b,0000000..c379fb3
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
- b5a10292c4dccfdb44e1ebd7c5baf757176c1e79
++c03be66094206080b1b0e998b23e4d38617741de
 +01299c5795a0c0b3842c1f6d3bc30d3714fc1248
 +01299c5795a0c0b3842c1f6d3bc30d3714fc1248
 +singular_3-1-5.dfsg.orig.tar.gz
 +eb6aabf3f389eec6a4605e43e807d946b432c0d9
 +19748109

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/singular.git