Conflits merge avec test
authorAli Jetha <ali.jetha@auf.org>
Tue, 28 Jun 2011 20:35:18 +0000 (16:35 -0400)
committerAli Jetha <ali.jetha@auf.org>
Tue, 28 Jun 2011 20:35:18 +0000 (16:35 -0400)
commit0b4d25820178b77f1a73a319062a9033161ab0ee
treeeba4ed7acfd08aa35bd227829bd03543c2209db3
parent8941aee736a8f2f3b68d11ceb6c443b74ab4a1d2
parent32f26ff374df3f22c457378d8e861691be94d261
Conflits merge avec test
buildout.cfg
project/settings.py