git://git.onelab.eu / plcapi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c996d4 6316c45)
Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:22:55 +0000 (22:22 +0100)
committerroot <root@blitz.inria.fr>
Wed, 17 Nov 2010 21:22:55 +0000 (22:22 +0100)

Trivial merge
plcapi