[mclibs] 11/11: Merge branch 'master' into debian

[Lifeng Sun]

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

lifengsun-guest pushed a commit to branch debian
in repository mclibs.

commit 7a2fdd931886e37422588208c6ee8e6d8d8a9d26
Merge: 5e9b493 4dd1b5f
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Aug 25 13:49:58 2013 +0800

    Merge branch 'master' into debian
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/control.d/0base.control

 debian/changelog                |   18 +++++++++++++-----
 debian/control                  |    7 +++----
 debian/control.d/0base.control  |    7 +++----
 debian/source.lintian-overrides |    1 +
 4 files changed, 20 insertions(+), 13 deletions(-)

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