Merge commit 'origin/esteel/renames'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000 (14:25 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000 (14:25 +0200)
Conflicts:
server/readme.txt


Trivial merge