Merge branch 'comments'
authorEevee <git@veekun.com>
Fri, 23 Oct 2009 02:31:14 +0000 (19:31 -0700)
committerEevee <git@veekun.com>
Fri, 23 Oct 2009 02:31:14 +0000 (19:31 -0700)
commit7c20a2661d532fe1e338f0f0dfb9fe42113ab103
treecea8a9567486227a199e3d9fec66fceed9f41f03
parent2037ab1d9057d34ccf0457e8fb5c7c34b2d89083
parentdc9ecbad36153af00773b4951120b4697b33193e
Merge branch 'comments'
floof/controllers/art.py
floof/model/art.py