From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 24 Feb 2012 10:52:18 +0000 (+0100)
Subject: Merge branch 'master' into sqlalchemy
X-Git-Tag: sfa-2.1-3~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331

Merge branch 'master' into sqlalchemy

Conflicts:
	sfa/storage/record.py
---

2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331