git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ac2c36 4fe4060)
Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Dec 2010 23:11:00 +0000 (00:11 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Dec 2010 23:11:00 +0000 (00:11 +0100)

Trivial merge
plcapi