Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus
commitd8380cd5583a4a73a609328be3bd0869acd731a9
authorHenri Bergius <henri.bergius@iki.fi>
Tue, 20 Nov 2007 16:02:02 +0000 (20 18:02 +0200)
committerHenri Bergius <henri.bergius@iki.fi>
Tue, 20 Nov 2007 16:02:02 +0000 (20 18:02 +0200)
tree76f0dda3604a48a4f076a0bfa54d4371bb82b7e1
parent68f187bc1167438d4721c93e47eb4820d3e50aae
parent5860ee720cdcbabdb6a22a17a53fbb9607ba87f7
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/ajatus