Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	debian/control
This commit is contained in:
Martin Konecny 2013-03-08 12:40:31 -05:00
commit e68e6d9160
1 changed files with 1 additions and 1 deletions

2
debian/control vendored
View File

@ -41,7 +41,7 @@ Depends: apache2,
pwgen, pwgen,
python, python,
rabbitmq-server, rabbitmq-server,
silan (>= 0.3.0~), silan (>= 0.3.1~),
sudo, sudo,
sysv-rc, sysv-rc,
tar (>= 1.22), tar (>= 1.22),