Merge branch 'dev'
authorPierre <piour@free.fr>
Tue, 30 Nov 2010 22:15:48 +0000 (23:15 +0100)
committerPierre <piour@free.fr>
Tue, 30 Nov 2010 22:15:48 +0000 (23:15 +0100)
commit26044d275fdb31b06bdb144bcf8a2c1046d07785
treef64840c7c38386860ab7ca7eb249ed10b06e2804
parentadabf9c8ca01b2783fcfc3b36a23a9200e7b1b18
parentd02acb97633af68a4d2cc12a1da03f4ba5118ce8
Merge branch 'dev'

Conflicts:
db/development.sqlite3