Merge branch 'master' of ssh://repo.or.cz/srv/git/adorno
commitc134c7c1c0c8a2d73b7ce5297a78251266c08486
authorAndrew McMillan <andrew@morphoss.com>
Wed, 16 Jun 2010 05:39:03 +0000 (16 17:39 +1200)
committerAndrew McMillan <andrew@morphoss.com>
Wed, 16 Jun 2010 05:39:03 +0000 (16 17:39 +1200)
tree03f135f663399ad192f0aa267d5e7fed9073ba0e
parent2c57fed1c63b35206e4285968733ed47419f6a84
parent5ab5c977f2aa689c5a87ac3e76bacd989a68b74f
Merge branch 'master' of ssh://repo.or.cz/srv/git/adorno