git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d57515 b7e47ff)
Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 18 Jul 2014 09:55:16 +0000 (11:55 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 18 Jul 2014 09:55:16 +0000 (11:55 +0200)

Trivial merge
plcapi