Merge branch 'master' into cp

Conflicts:
	ranger/__main__.py

1 files changed, 15 insertions, 0 deletions

diff --git a/all_tests.py b/all_tests.py
index 6693b870..90926918 100755
--- a/all_tests.py
+++ b/all_tests.py
@@ -1,4 +1,19 @@
 #!/usr/bin/python
+# Copyright (C) 2009, 2010  Roman Zimbelmann <romanz@lavabit.com>
+#
+# 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/>.
+
 """Run all the tests inside the test/ directory as a test suite."""
 if __name__ == '__main__':
 	import unittest