filelilist
no debian in upstream
Merge /home/alex/conedy/conedyGit into upstream

Conflicts:
	fileList
fileList
Merge /home/alex/conedy/conedyGit into upstream
readding debian to packaging
Merge branch 'packaging' of 10.47.13.9:/home/alex/conedy/conedyGit into packaging
readjusting dependencies due to bjam
Merge branch 'packaging' of 10.47.9.61:/home/alex/conedy/conedyGit into packaging

Conflicts:
	debian/control
i
aebi
aebi
Merge branch 'master' into packaging
Merge branch 'master' into packaging
aetribae
aebiab
aeiba
Merge branch 'master' into packaging
iaebiaeb
aeib