Resolved conflict from last merge.
authorThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Fri, 28 Sep 2007 11:50:30 +0000 (08:50 -0300)
committerThadeu Lima de Souza Cascardo <cascardo@mail.holoscopio.com>
Fri, 28 Sep 2007 11:50:30 +0000 (08:50 -0300)
commit95c63a1a88c14308f58db9504b94fd1844be624f
tree069c4c59805717ef84eb6b560f03303d39ae302b
parentd0f8a3ab75f2c71f442beb5fd5cb9852ac75a4d9
Resolved conflict from last merge.
views.py