Merge branch 'master' of git://localhost/acess2

Conflicts:
	TODO.txt

diff --cc TODO.txt
index 8a75c21,f6c8efa..5ac59f4
--- 1/TODO.txt
--- 2/TODO.txt
+++ b/TODO.txt
@@@ -46,7 -46,7 +46,8 @@@ TODO
  - AxWin3
   > Text editor (with a GP formatted text field?)
   > Maybe a basic web browser using the surface support?
 + > Port freetype for nice font support
+  > Configuration (via lib/server)
  
  - Omnispeak
   > Debug speed issues (tracing agian)