From: yomguy <yomguy@parisson.com>
Date: Wed, 8 Jun 2011 14:42:25 +0000 (+0200)
Subject: merge unstable (add conservation_site field to collection)
X-Git-Tag: 1.3.9~3^2~1^2~94
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=db74edda8e4fad3b6de04bd56f1392a1fe83e0f4;p=telemeta.git

merge unstable (add conservation_site field to collection)
---

db74edda8e4fad3b6de04bd56f1392a1fe83e0f4