Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Tue, 26 Jun 2007 15:32:45 +0000 (17:32 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Tue, 26 Jun 2007 15:32:45 +0000 (17:32 +0200)
commitafa1509c3b4d5954dfd419cc79b500835a468289
tree9c25873abe26b50c83558afcd728bec067064ea5
parent076a6cc9e851011927ce11393e3850dd4a016db5
parent63e3aac76734488a868f088118591e4222f687e5
Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare