[med-svn] [relion] 02/36: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/relion

[Roland Fehrenbacher]

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit 2bea32cad78f882c78cf4aa9f76aa1590ac65c53
Merge: 5c31927 0094f3a
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Fri Oct 10 14:05:25 2014 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/relion

 debian/control           | 58 +++++++++++++++++++++++++++---------------------
 debian/rules             |  0
 debian/upstream/metadata | 11 +++++++++
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --cc debian/rules
index e5a891f,8b13789..e5a891f
mode 100644,100755..100755
--- a/debian/rules
+++ b/debian/rules

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