[med-svn] [mia] 03/03: resolve merge conflict

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository mia.

commit c5328b9a645d85ca6c0faa254187909c25f2358e
Merge: 353314a 3a0dcdf
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Jul 28 18:52:40 2016 +0000

    resolve merge conflict


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git