volpino 3ef800b68d Merge branch 'master' of https://github.com/iksaif/euscan ... Conflicts: bin/euscan_patch_metadata euscanwww/djeuscan/views.py pym/euscan/handlers/__init__.py pym/euscan/handlers/kde.py pym/euscan/handlers/url/cpan.py pym/euscan/handlers/url/generic.py pym/euscan/handlers/url/github.py pym/euscan/handlers/url/php.py pym/euscan/handlers/url/pypi.py pym/euscan/handlers/url/rubygem.py pym/euscan/scan.py Signed-off-by: volpino <fox91@anche.no>		2012-07-26 10:57:38 +02:00
..
euscan	Merge branch 'master' of https://github.com/iksaif/euscan	2012-07-26 10:57:38 +02:00