Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
commit34cb5eba1ce1d689d622a962444d5b6118b87bbe
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 28 Jun 2008 15:17:46 +0000 (28 17:17 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 28 Jun 2008 15:17:46 +0000 (28 17:17 +0200)
tree9a593058682743b1d57367477162bfc5b051eeef
parent58a646b4823b7f49ba855324e1f751c32b8958ee
parentc3ff949d18dc961ec77b55a33182b6fe61d13488
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg

Conflicts:

worg.css
worg.css