commit e670b5b218506ebce7d157248bde9f91f392aa8c Merge: a48ca0f 4716166 Author: Arturo Filastò art@fuffa.org Date: Fri Nov 16 10:26:52 2012 +0100

Merge remote-tracking branch 'flavioamiero/fix-requirements' into requirements

* flavioamiero/fix-requirements: Use the latest txtorcon in pypi Tells pip to install scapy from the website

Conflicts: oonib/requirements.txt

oonib/requirements.txt | 2 ++ requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)