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

This commit is contained in:
Weblate 2016-01-08 22:11:08 +01:00
commit eaa56347b3

2
debian/control vendored
View file

@ -28,7 +28,7 @@ Depends: ${python:Depends}, ${misc:Depends},
curl,
mariadb-server | mysql-server, php5-mysql | php5-mysqlnd,
slapd, ldap-utils, sudo-ldap, libnss-ldapd,
postfix-ldap, postfix-policyd-spf-perl, postfix-pcre,
postfix-ldap, postfix-policyd-spf-perl, postfix-pcre, procmail,
dovecot-ldap, dovecot-lmtpd, dovecot-managesieved,
dovecot-antispam, fail2ban,
nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl,