Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Wed, 4 Jul 2007 23:46:02 +0000 (01:46 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Wed, 4 Jul 2007 23:46:02 +0000 (01:46 +0200)
commitd776f08c024659d4972e2e22f7374929dc288b99
treed25a2b98fa3e72ae60adbe53814d52d0430efc0b
parenta33bf3b7cd7c135bd3b93209aa9f60ba09879bdd
parent41fabc21b8fb8b1a3b9bf65fb2d6d91bf4ce7892
Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare