Merge branch 'master' into sqlalchemy
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 24 Feb 2012 10:52:18 +0000 (11:52 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 24 Feb 2012 10:52:18 +0000 (11:52 +0100)
commit2cf6d0e7089437ec8ad8e5fdfac26760e0c7a331
tree139b1deb809f0bd7aa57d4ac727724d91c11e7b9
parent0c196d253cba420b7560cd32caf2f3d4cc18a3a2
parent8712d295c3a4b5f8debe59a1755c1f9b461ab49c
Merge branch 'master' into sqlalchemy

Conflicts:
sfa/storage/record.py