big merge from steffen

2010-07-13 20:20:46 +01:00
parent b52110d45f 522a745ead
commit c36e87a24d
80 changed files with 3369 additions and 2086 deletions
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python
 # -*- coding: utf-8 -*-

 #Copyright 2008-2010 Steffen Schaumburg