Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare
authorFredrik Tolf <fredrik@dolda2000.com>
Thu, 21 Jun 2007 16:20:47 +0000 (16:20 +0000)
committerFredrik Tolf <fredrik@dolda2000.com>
Thu, 21 Jun 2007 16:20:47 +0000 (16:20 +0000)
commit8086be2927a8723f47e1fc5e46493185108d7af2
treea1dacb5773ebb26ea3b43e8e2d64697de4178df4
parent72ef9ac1add1aa2f1cdd1f2f6b3182f5b3c25a25
parent3586d0961d8e0471ce1996436fef92eed7a2c521
Merge branch 'master' of git.dolda2000.com:/srv/git/r/kokare