This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 7b6efcdc96fd2a8a37cc3e5d09bb2bba1eb9a5ef Merge: 0f0ae84 9b0876f Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Mon Jul 6 16:37:11 2015 +0200 Merge branch 'develop' of https://git.chorem.org/mum into develop Conflicts: debian/rules redhat/mum.spec README | 8 ++-- mum.conf => conf/mum.conf | 2 + conf/mum.sudoers.d | 1 + debian/postinst | 38 +++--------------- debian/postrm | 9 +++++ debian/preinst | 5 +++ debian/rules | 43 +++++++++------------ in-venv.sh | 7 ---- install.sh | 35 ----------------- mum.sh | 11 ------ redhat/mum.spec | 70 +++++++++++++++++++++------------- mum-daemon.sh => scripts/mum-daemon.sh | 0 scripts/mum-env.sh | 69 +++++++++++++++++++++++++++++++++ scripts/mum-in-venv.sh | 14 +++++++ scripts/mum-install-venv.sh | 16 ++++++++ scripts/mum.service | 8 ++++ scripts/mum.sh | 12 ++++++ 17 files changed, 208 insertions(+), 140 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.