git://git.onelab.eu / sfa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c196d2 8712d29)
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)
Conflicts:
sfa/storage/record.py


Trivial merge
sfa