merged with carl, fixed conflict in hhc

2009-08-09 20:10:14 +01:00
parent 2510cc66c9 d6529ab42f
commit 9f2834488c
22 changed files with 989 additions and 750 deletions
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-

 #Copyright 2008 Carl Gherardi
 #This program is free software: you can redistribute it and/or modify