git.onelab.eu Git - sfa.git/commit

author	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Fri, 24 Feb 2012 17:47:01 +0000 (18:47 +0100)
committer	Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
	Fri, 24 Feb 2012 17:47:01 +0000 (18:47 +0100)
commit	5822ffb68c0d4cc5e29ec945e0dc21125294463f
tree	e56b9c871ee30ff9a4e273f4ceeba182986a6daf	tree \| snapshot
parent	05838d8404f723a813bc9580cfe6c25bbc59b958	commit \| diff
parent	5b87a5dcd79d308f6abd913de655373ef639cc47	commit \| diff

Merge branch 'master' into sqlalchemy

Conflicts:
sfa/importer/sfa-import-plc.py