Merge branch 'master' of ssh://karora@repo.or.cz/srv/git/adorno
commit8c9371286e281cea2c27518598aaa7da126c6f29
authorAndrew McMillan <debian@mcmillan.net.nz>
Sun, 28 Dec 2008 04:29:44 +0000 (28 17:29 +1300)
committerAndrew McMillan <debian@mcmillan.net.nz>
Sun, 28 Dec 2008 04:29:44 +0000 (28 17:29 +1300)
tree95b33b1390647f221fb84df6c051c4b4b027850b
parent48158ade6069bd9075ab151b1842b6c0f6bf2a67
parentf8bd47d4aaece6639431c46221d9e9496e478c54
Merge branch 'master' of ssh://karora@repo.or.cz/srv/git/adorno