Merge branch schemachange
authorHelmut Grohne <helmut@subdivi.de>
Tue, 26 Mar 2013 14:59:48 +0000 (15:59 +0100)
committerHelmut Grohne <helmut@subdivi.de>
Tue, 26 Mar 2013 14:59:48 +0000 (15:59 +0100)
1  2 
importpkg.py
webapp.py

diff --cc importpkg.py
Simple merge
diff --cc webapp.py
Simple merge