Merge branch 'master' of cloudy.halo.gen.nz:objavi2
commit65512af97b114644fca00ed98659dc9457d6dd1c
authorDouglas Bagnall <douglas@paradise.net.nz>
Mon, 22 Jun 2009 10:10:47 +0000 (22 22:10 +1200)
committerDouglas Bagnall <douglas@paradise.net.nz>
Mon, 22 Jun 2009 10:10:47 +0000 (22 22:10 +1200)
tree9613c5433b33ac22a1fbbf4e12e0f94273aa8520
parent32666a7b48c5edf812665bd318fadfe43abd572c
parentac8e3df2f7dbcb269c5df15201828793ec123a48
Merge branch 'master' of cloudy.halo.gen.nz:objavi2
config.py