Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Weblate 2016-01-22 18:34:15 +01:00
commit ea589c965a

4
debian/control vendored
View file

@ -39,9 +39,9 @@ Recommends: yunohost-admin,
bash-completion, rsyslog, ntp, openssh-server, bash-completion, rsyslog, ntp, openssh-server,
inetutils-ping | iputils-ping, inetutils-ping | iputils-ping,
php5-gd, php5-curl, php-gettext, php5-mcrypt, php5-gd, php5-curl, php-gettext, php5-mcrypt,
udisks-glue, unattended-upgrades, unattended-upgrades,
libdbd-ldap-perl, libnet-dns-perl libdbd-ldap-perl, libnet-dns-perl
Suggests: htop, vim, rsync, acpi-support-base Suggests: htop, vim, rsync, acpi-support-base, udisks2
Conflicts: iptables-persistent, Conflicts: iptables-persistent,
moulinette-yunohost, yunohost-config, moulinette-yunohost, yunohost-config,
yunohost-config-others, yunohost-config-postfix, yunohost-config-others, yunohost-config-postfix,