Merge branch 'master' into 0.10

1 files changed, 0 insertions, 18 deletions

diff --git a/mitmdump b/mitmdump
index da3c80e1..d7f784a1 100755
--- a/mitmdump
+++ b/mitmdump
@@ -1,20 +1,4 @@
 #!/usr/bin/env python
-
-# Copyright (C) 2010  Aldo Cortesi
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
 import sys, signal
 # The unneccesary console import here is to work around a bug in pyinstaller
 from libmproxy import proxy, dump, cmdline, version, console
@@ -70,5 +54,3 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         pass
 
-
-